[automerger skipped] Merge "Merge Android U (ab/10368041)" into...

[automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 78602c48 -s ours am: 2eab76d2 -s ours

am skip reason: Merged-In Ied8e295ae059db07463ba06d3e6d747659b2757f with SHA-1 ba248cd1 is already in history

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



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