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

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

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