[automerger skipped] Merge changes from topic "av1-odd-wh-sc-mainline-prod"...

[automerger skipped] Merge changes from topic "av1-odd-wh-sc-mainline-prod" into tm-dev am: f1f4937f -s ours am: 1cdc0003 -s ours

am skip reason: Merged-In Ia47fa8f9936873542a6e7f46e2f704b273a69b5c with SHA-1 b20df892 is already in history

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

Change-Id: Iad696a2542e612a25244d0712a7f737607423a45