[automerger skipped] Merge TP1A.221005.003 am: 0128edf3e8 am: ec56a2539d -s ours am: f4c8750a58 -s ours

am skip reason: Merged-In Ie8c226d9e7d1d0dc481d026ccd454a1db46fb915 with SHA-1 5996c60385 is already in history

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

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