Merge changes from topic "cherrypicker-L08100000963622070:N87300001415597844"...

Merge changes from topic "cherrypicker-L08100000963622070:N87300001415597844" into main am: 471e7857 am: 199b5d22

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



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