Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.C10.11.00.00.840.553' am: 7e249f0936 am: ff46e3593a

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

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