Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.C10.11.00.00.840.010' into sc-dev am: e53791a6fc

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

Change-Id: I0cf15086cbdb1fbf9f0206e9a140b35c12384352