[automerger skipped] Merge "Merge 10952656" into aosp-main-future am: 3d862c96 -s ours

am skip reason: Merged-In I27fe6f65f491db9d88710cf163eba12079499a09 with SHA-1 f7e0442a is already in history

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



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