[automerger skipped] Merge Android U (ab/10368041) am: 5619cfe8e6 -s ours am: 0754099440 -s ours am: 10f0c88dc9 -s ours am: 2fcf6c5c44 -s ours

am skip reason: Merged-In I9e64f07a80578a3defabd93f5f8117232e18c222 with SHA-1 e13ad5fc63 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7250/media/+/24182577

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