[automerger skipped] Merge Android U (ab/10368041) am: 65d53089 -s ours am:...

[automerger skipped] Merge Android U (ab/10368041) am: 65d53089 -s ours am: 89eddf74 -s ours am: ca0e1033 -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: I636595de5b520645480d2b1b9e5c040c088f657d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>