Merge "[User Switcher] Ensure unlocked when launching" into tm-qpr-dev am: 6ecea866

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



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