Merge "Fix keyguard and qs user switcher disabled state" into rvc-dev am:...

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

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

Change-Id: I4b48bf0693dcbba736972b9434e7a86683701875