Merge "Swap out owners for keystore frameworks bits" into main am: 43a12e6d am: 1dc05580

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



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