Merge "Merge UP1A.230905.019" into aosp-main-future am: 464ddcb6 am: d2b5757c

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



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