Merge "Merge "Fix keyguard and qs user switcher disabled state" into rvc-dev am: 31b2931b am: ad107265 am: 421ec2a1" into rvc-qpr-dev-plus-aosp am: bd2d4ca0

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

Change-Id: I0eb101e03e87e5f3cbeaa5ff09458a615b84374b