Merge "Clean up keystore owners" into main am: 2b19b792fe

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3314671

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