Merge "Clean up keystore owners" into main am: 6faa37113c

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

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