Merge changes from topic "LA.UM.9.12.R2.10.00.00.685.011-merge" into rvc-d1-dev am: b7df3909f2

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

Change-Id: I05b31b22698c8badfd81ea596ac41744bec80c80