Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.C10.11.00.00.840.517' am: 4f6ae4aa8e am: 0deed8df32

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

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