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

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

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



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