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

[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 50cb410d -s ours am: b880ec28 -s ours am: 869385ac -s ours am: e9c14e46 -s ours

am skip reason: skip tag Change-Id I343b7074cc80f932103447d930ccdcdc8f0a1919 with SHA-1 79754e1f is already in history

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

Change-Id: I80b7c7b246fe38f2f135811f12242ea2c642c9b8