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: ee95c315 am: 987839ab

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

Change-Id: I62dccbcd26df557581b838a5e6afbd80ae0b4a55