[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am:...

[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: e5900308 -s ours am: 7f0d309a -s ours am: fa65ec80 -s ours am: 0e59ba1e -s ours

am skip reason: subject contains skip directive

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

Change-Id: If870ecd6d2ff0b5660325464a2a6f6b46a954092