Snap for 8479413 from c98d629586974f64c5f76a6193bf29637ff50eec to tm-release am: 4d857c8f98

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

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