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

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



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