Merge "Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.C10.11.00.00.840.553' am: 7e249f0936 am: 6774a2ad07" into udc-d1-dev-plus-aosp am: 20afd6af2e

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

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