[automerger skipped] Merge "New user switcher dialog" into sc-v2-dev am:...

[automerger skipped] Merge "New user switcher dialog" into sc-v2-dev am: 39615056 am: d7b73967 -s ours

am skip reason: Merged-In I903d111822d1958fb53c43932b2df1393c841c71 with SHA-1 e7401754 is already in history

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

Change-Id: Icee66e659f3b49d5c758cbc60595ae96152447d1