Merge "Update owners for keystore related files" into main am: 488eed6f84 am: b7f303e86c

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

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