Revert "Revert "[Bouncer] refine entry for bouncer user switcher.""

This reverts commit 4da665d4a4123ca2a90b22cbdd9041df1934c521.

Reason for revert: Fix forward

Change-Id: Id3aaa354bd712d76995f27daa0beda370824eba3
8 files changed