[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 35bc073d1f -s ours

am skip reason: Merged-In I0bc25869eee8baef53664e16dedbeda7fa28a9a7 with SHA-1 b0836ab0a9 is already in history

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

Change-Id: Ic08756ba564eb6a9afd01aae3604b9cef98b99a3