[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: 0f542339 am: c3b50d13 am: d55e016d -s ours
am skip reason: subject contains skip directive

Change-Id: Ia0b7d079e376a28a21a7c72bd0e3496dcb6daf4e