Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.C10.11.00.00.840.010' into sc-dev am: 8dfd3f81ab am: 9dfe2f3bbc

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

Change-Id: I4a8ac598d1383ffc30f3da619af8b121d8118d2a