[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: b339b4787e -s ours

am skip reason: Merged-In I9670bc63fb7d9e2c2091357f16bea27e8e3331bf with SHA-1 a2a1421dd5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/19094817

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