Merge changes from topic "cherrypicker-L48700030005938629:N88900030094104124" into main am: 91bc552ca6 am: d537bf9227

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

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