[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L97700000953132352:N82800001237721998" into tm-mainline-prod am: 6cbabd11 -s ours

am skip reason: Merged-In I307e994a6554e7e66a6af2d389fc0834d2c63e2f with SHA-1 1cfdc6b7 is already in history

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

Change-Id: I4de2aad777d8a864a3716c89687667085ddc50d6