Merge "Update Keystore owners" into main am: db385e23c2

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

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