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

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

Change-Id: I3cca6de7aedbefd22e18ac2771b5c251d78d2bee