This reverts commit 7b4b65a3, which
caused a regression in the user menu part of Advanced Mobile
Contributions mode.

Bug: T244436
Change-Id: Ifce627dac35b2cd05e1c5ebe658534b6b8d0de88
(cherry picked from commit 6e4c6c99)