Merge "Merge UQ1A.231205.015" into aosp-main-future am: 889283fb

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



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