[automerger skipped] Merge changes Ib89e0924,Id2816580 am: 2100e632 am:...

[automerger skipped] Merge changes Ib89e0924,Id2816580 am: 2100e632 am: 8cea1068 am: 7d66f141 -s ours

am skip reason: Merged-In Ib89e09243a01cebc2f7996b6b572384a1471867a with SHA-1 83a21465 is already in history

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



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