[automerger skipped] Merge "Tablet-specific UI updates to user switcher. DO...

[automerger skipped] Merge "Tablet-specific UI updates to user switcher. DO NOT MERGE" into rvc-dev am: 7def6932 am: 9463b875 am: e3968788 am: 311f6a5c -s ours
am skip reason: subject contains skip directive

Change-Id: I4ec3bfb0c41d80b63ce1b534b08420c5ed3e9669