[automerger skipped] Merge "Merge RQ2A.210405.006 to stage-aosp-master - DO...

[automerger skipped] Merge "Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 810506db -s ours am: f4801a37 -s ours am: 7da68ed6 -s ours am: 31a7c7ad -s ours

am skip reason: subject contains skip directive

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

Change-Id: I91dc73f6dd2d562d7b31ea962c9431286178449d