Merge "Blind fix for user switcher instant crash." into tm-qpr-dev am: a0d7be3a am: 1c058379

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



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