[automerger skipped] Fixes user switcher dialog animations. am: 20fd9de9 am: 1c02db2b -s ours

am skip reason: Merged-In Ia33c8644ca891879f36c62c0257ebdc897623c40 with SHA-1 637af685 is already in history

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



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