Merge "Prevent crash when on UserSwitcherActivity rotate" into tm-qpr-dev am: 7cdb42734e

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

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