[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L08100000963622070:N87300001415597844" into main am: 471e7857 am: 7702966e -s ours am: 48075c50 -s ours

am skip reason: Merged-In Ifa5324e2b5f9e86bbb10dd1fe3cc60552e1236f0 with SHA-1 6c41740d is already in history

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



Change-Id: I2afcf9869e6df40b43399ca66492bfa535350ceb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>