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

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

Change-Id: I1851881b4c639ab5ec8b27bcc8a92fb9218a93c7