[automerger skipped] Merge ab/7633965 am: 1c681a3f77 -s ours

am skip reason: Merged-In I77d92d95f0db738059c515f0699e154c7cb19e33 with SHA-1 b30ded9d98 is already in history

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

Change-Id: Idc457cdd48e2ac2decf1910e6a8bbdb5f25f689a