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

Merge "[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 288ed92b -s ours" into sc-dev-plus-aosp am: e1db8661 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15023932

Change-Id: I098375521e9570fbaf3bb407d3d686f7291d9301