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

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

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