[automerger skipped] Merge changes Iac870a24,I74afe105,I7db17475,I1e0cd95f am:...

[automerger skipped] Merge changes Iac870a24,I74afe105,I7db17475,I1e0cd95f am: bf3f93bb am: 5960c25a am: bab55dd9 am: 1943fc99 -s ours

am skip reason: Merged-In Iac870a24d619db8a86ce91029f25c50ef862a268 with SHA-1 d1d52fac is already in history

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

Change-Id: If1fe292e553f0e0665dedbacc4ab8211d5c84dc3