Merge "Merge "Improve multi user settings screen" into rvc-dev am: e26de87100 am: e7e0479c36 am: ce855ed43e" into rvc-qpr-dev-plus-aosp am: 8cc58ffe1d am: 97fe213b11
Change-Id: Icfb2f09f10c727ca02de609d4b86c8c5d608c03c
This commit is contained in: