[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 91cade0cf6 -s ours am: 55e2add62b -s ours am: 3a41f55ce7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0c173b147324b5476492e13c59ae9f1116b31637