[automerger skipped] Merge "Add keyguard OWNERS for keyguard/ and some files in statusbar/." into main am: e1654022 am: b7e21064 -s ours

am skip reason: Merged-In I3cf8897eaa9d2ad852c1198cdf9eb22658e872c1 with SHA-1 fa53f0a4 is already in history

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



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