[automerger skipped] Merge Android R am: 11368760 -s ours am: e8d98e4d -s...

[automerger skipped] Merge Android R am: 11368760 -s ours am: e8d98e4d -s ours am: 2c7b6e54 -s ours am: 10f108d3 -s ours am: a7661d1c -s ours

am skip reason: Change-Id I33c8b79d82aaaecd05cc1c74f6c6a8613c42fa68 with SHA-1 f9d897c0 is in history

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

Change-Id: I19549799d4d5c095a9365141abbd4bae08295c94