[automerger skipped] Merge "User switcher - Update when multiple users...

[automerger skipped] Merge "User switcher - Update when multiple users enabled/disabled" into tm-dev am: 287c0093 -s ours

am skip reason: Merged-In Idbaf97c599bacba2122cbce2d047eb59262ac63e with SHA-1 6f9dae7f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17638757



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