[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 334c2c972e -s ours

am skip reason: Merged-In I3d9dc14162402c7897688401183347b78ffd4e86 with SHA-1 57778dc0da is already in history

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

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