[automerger skipped] Merge changes I2b06e477,I0ef2862f into...

[automerger skipped] Merge changes I2b06e477,I0ef2862f into android15-tests-dev am: 74e63008 -s ours am: fa1db3ae -s ours

am skip reason: Merged-In I2b06e477ee276296e2f8216c2ee99f4c526005a5 with SHA-1 649c20ef is already in history

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



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