Merge "Merge UP1A.230905.019" into aosp-main-future am: 464ddcb6e3 am: d2b5757c71 am: 993a81ff9f

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

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