[automerger skipped] Merge "Merge RQ2A.210305.007" am: 726677e6 -s ours am:...

[automerger skipped] Merge "Merge RQ2A.210305.007" am: 726677e6 -s ours am: 7d18d281 -s ours am: 4494cbd6 -s ours am: 381ef90c -s ours

am skip reason: Change-Id Ib1d821a873e8aa0a2251792842de9b57cd80d87e with SHA-1 74ba7b84 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d0af6b53e67e4e6f5def2029b4a6d009b93ef87