[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 skip reason: subject contains skip directive

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

Change-Id: I2db9a655491f8ed9881696bd39c320631f074ba0