[automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am:...

[automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 60894b7a am: 5b95f2eb -s ours am: 884e0574 -s ours am: 6dbb5fe9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icdd2bfe460b5e2b427f26e6d1e9979368abe03fc