[automerger skipped] Merge changes I6c1af92f,Icf594d40 am: e6849d568a am: 33c8a2614d -s ours am: 40fc6c7244 -s ours am: 2b9a4dbae4 -s ours

am skip reason: Change-Id I6c1af92f640fde833d2d93f7db4576c92a6f9719 with SHA-1 886f321139 is in history

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

Change-Id: I5729bf1c8d4265e1f94c154b3e5783cca733aae2