[automerger skipped] Merge "Revert "Fix user switcher flicker."" into udc-dev...

[automerger skipped] Merge "Revert "Fix user switcher flicker."" into udc-dev am: adf330a1 am: 7498c0d9 -s ours am: 29033709 -s ours am: be485a87 -s ours

am skip reason: Merged-In I1680d66336b5b6d5d1065c85ac4b09ca56e12d7a with SHA-1 dc072507 is already in history. Merged-In was found from reverted change.

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



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