[automerger skipped] Merge 10952656 am: 84fe582d -s ours am: 2d03aee5 -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: Ic29664f3166db1808c655ade1a77026b370cd47c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>