[automerger skipped] Merge "Merge RQ2A.210305.007" am: 726677e6cc -s ours am: 7d18d2815a -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa6951c033669abfca41e60c75415f5665f0676e