Merge "Allow User Switcher to always be able to be launched in lockTaskMode" into tm-qpr-dev am: 1ffeb051 am: ccd0728c am: 439a56ff am: 1281f025

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



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