[automerger skipped] Merge changes Ic82ffd2f,I29632003 am: fd593414 am:...

[automerger skipped] Merge changes Ic82ffd2f,I29632003 am: fd593414 am: 869d9061 am: 613c119c am: 83e33233 -s ours

am skip reason: Merged-In Ic82ffd2feacc107e9b291ef3aab861d0c1496489 with SHA-1 c83bce4c is already in history

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

Change-Id: Ie815f06b7c9ecc5fc9631f1d8ec19fb7a39bb5f3