[automerger skipped] DO NOT MERGE - Mark RQ1A.201004.001 as merged am: 528369f3 am: 358bc09b -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia0133022fca81b0042a91a2ccec6b9393983c773