[automerger skipped] Fix user switcher flicker. am: 334ebcea am: 3fd6c160 -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: I23e34b015af835e005d5dafe699bad6841e9e824
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>