Merge changes from topic "am-5868f344c1ce47c590547b3cae29e970" into rvc-d1-dev-plus-aosp
* changes:
Merge "Tablet-specific UI updates to user switcher. DO NOT MERGE" into rvc-dev am: 7def6932 am: 9463b875
Tablet-specific UI updates to user switcher. DO NOT MERGE am: 2724b002 am: b281448f