[automerger skipped] Merge "Upgrade KeyMint version" am: b2f12f93 am: ce0a0909 am: a1569f82 -s ours

am skip reason: Merged-In I95191fd09b138bf3ba1cbb50534fdbdcf36d1596 with SHA-1 4be13922 is already in history

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

Change-Id: I4c21e46ab55d82e2161e5100a3f4019d83955c9d