[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: b4a4ead4a3 -s ours

am skip reason: Merged-In I1a32556cdff371138118028772b773f5e9b22c61 with SHA-1 5569b04a43 is already in history

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

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