[automerger skipped] Merge "Merge SQ1A.220205.002" am: 497bfda9 am:...

[automerger skipped] Merge "Merge SQ1A.220205.002" am: 497bfda9 am: 41244dc1 -s ours am: f2e2ac7c -s ours

am skip reason: Merged-In Ie8d6792ff391d36d0e199a1d7f649e6081c1e8ac with SHA-1 cc538ed2 is already in history

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

Change-Id: Ic89caad10cbb4952794fcd0c8d40080d5bae3e88