Merge TP1A.221005.003 am: 0128edf3e8

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

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