[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am:...

[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: 8c73b84f -s ours am: 16f96516 -s ours am: 1744d4a3 -s ours am: f8894eed -s ours

am skip reason: Merged-In Ia6f74d8ab72a20eaf167273a1944eddb56f87284 with SHA-1 7e7d3ebb is already in history

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



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