Merge "Update icons in multiuser settings" into tm-qpr-dev am: a666d809 am: 8b7a6d53

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745315



Change-Id: Ic435088eeef5d07507868925b869550760364386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>