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

am skip reason: Merged-In If67dcf3fda8af0c86dd9cc825eb6fd0b0f57cd78 with SHA-1 288ed92b is already in history

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

Change-Id: I296906bdd6a7271747ab43075df2581c61e4c20c