Merge "Fix keyguard and qs user switcher disabled state" into rvc-dev am: 31b2931b am: ee95c315 am: 987839ab am: 39222bbd

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

Change-Id: Ie6d14297eed49f410ba355c15b9f2dc5febabde1