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

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



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