[automerger skipped] Merge changes from topic "226452499" into android12-tests-dev am: 970cccb939 am: 94755b9007 -s ours am: 7dafb3d92e -s ours am: 59a552857a -s ours

am skip reason: Merged-In I5ef42c922a0b0a037d2cf70ca83790fc95196ccb with SHA-1 cf52cb0307 is already in history

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

Change-Id: Ib94b6e353eeecb69a479e0df0758e52e84705198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>