[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: 6bcf14f5 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10753ba00fbe39f0c45a3ab1e9fc2d5333c39631