[automerger skipped] identity: Fix VTS test failure caused by unrelated change...

[automerger skipped] identity: Fix VTS test failure caused by unrelated change to system/keymaster. am: b098e79d am: 6f9bebef -s ours am: ee0272d5 -s ours

am skip reason: Merged-In I58426f1551efa920909c759cf5e10f44c6cfc5d4 with SHA-1 b098e79d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14788964

Change-Id: I7aa5626df416b1ea5e75317b4f766ffa29e62f20