[automerger skipped] Fix user switcher flicker. am: 334ebcea am: 3e472d42...

[automerger skipped] Fix user switcher flicker. am: 334ebcea am: 3e472d42 am: 9ddf6a99 -s ours am: d30769b4 -s ours

am skip reason: Merged-In I1680d66336b5b6d5d1065c85ac4b09ca56e12d7a with SHA-1 334ebcea is already in history

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



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