[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: f9aa8a4540 -s ours am: b4a6d8c2a1 -s ours am: f3dab87977 -s ours

am skip reason: Merged-In Ib42d062101103f8c503681b56eb9e65cdf8b85c1 with SHA-1 c98d629586 is already in history

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

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