[automerger skipped] Merge changes Id027b742,I486ccad8 am: 44c294e6 am:...

[automerger skipped] Merge changes Id027b742,I486ccad8 am: 44c294e6 am: 6ece4c1d am: 0ba33188 -s ours am: 36a8274a -s ours

am skip reason: Merged-In I58bd8b941f6340d9e69153702b5269cc35c646da with SHA-1 0d591fd0 is already in history

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

Change-Id: I092d2c00a62f76691c925ae1668a6a562382f0f1