[automerger skipped] Merge Android U (ab/10368041) am: 5619cfe8e6 -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: I9fdf8cbe6c448dd9f8cbf84170d611da3d705c0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>