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

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

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