[automerger skipped] Merge "Move showing keyguard after the...

[automerger skipped] Merge "Move showing keyguard after the UserSwitchObservers." into 24D1-dev am: 3f2c73a9 -s ours

am skip reason: Merged-In I0bcd3ba4ad5ee89653447e8119868deec2175a07 with SHA-1 ad64f730 is already in history

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



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