Merge "Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.C10.11.00.00.840.553' am: 6beb06813e am: e13ad5fc63" into udc-d1-dev-plus-aosp am: 70bca07c8c am: d4d83bbb85

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

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