Merge "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" into sc-v2-dev-plus-aosp am: e96a045a -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib0f0bea57ec38352279a358ed353677c3a3b27ad