[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 skip reason: skip tag Change-Id I531ee79ff05db24edef1d2a0bba518b356a0e043 with SHA-1 0c124208 is already in history

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

Change-Id: I8cded70542e54edc32282b8263b32678766097e3