[automerger skipped] Skip ab/6749736 in stage. am: f5c754682f -s ours

am skip reason: Change-Id I9f62e67c9ae27fc1effa831cc6bc47c0975e278d with SHA-1 70744c1804 is in history

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

Change-Id: Ib746ef8067fd9ab19d5252701fe537d2dd4eb92f