Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.C10.11.00.00.840.553' am: 6beb06813e am: 13efc05ab0 am: e94c38d8d2

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

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