[automerger skipped] Mark ab/8191998 as merged am: 31da10914f -s ours

am skip reason: Merged-In I15330a2f23c3461e23daad450af33e3f92e6730c with SHA-1 7f7cabaaee is already in history

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

Change-Id: I15fbdf4373df995b13b8ec480615f1f73015f978