[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am:...

[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 6153d3dc -s ours am: cb09c604 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0922f1c9d61d0f1479829c6efab8b4525ee32b4e