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

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

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