Merge "Add ownership of scrim/lockscreen files to keyguard" into main am: c6423902

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



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