[automerger skipped] Merge changes I118b2c04,I111b72aa,Ia5d29126 am:...

[automerger skipped] Merge changes I118b2c04,I111b72aa,Ia5d29126 am: 660e9a4c am: 0a8a2b9d am: c9b4e030 am: c8f5cd1d am: 3c73017a -s ours

am skip reason: Merged-In I118b2c04bff12b64a7cac4dc2c88217a6a270046 with SHA-1 975ea3ae is already in history

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



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