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