[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: abf2b89f -s...

[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: abf2b89f -s ours am: 145c97fb -s ours

am skip reason: Change-Id I3392a718ae479ff09d42c49c4c9a5e1c2eb6c81a with SHA-1 2bb38c61 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14f3dbb45390715e87684e0ac14e91c063e0962d