Merge "Update Keystore owners" into main am: db385e23c2 am: 890da941e1

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

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