Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.R2.10.00.00.685.011' into rvc-d1-dev am: f58212eb01

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

Change-Id: I3d124f8bb21472940b7bd303044ed1da8709124e