[automerger skipped] Merge "DO NOT MERGE - Mark RQ1A.201004.001 as merged"...

[automerger skipped] Merge "DO NOT MERGE - Mark RQ1A.201004.001 as merged" into stage-aosp-master am: b9a95883 am: 58b3deb6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2cd20d1e843349d2c00a24b533e4a08b44515961