[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 334c2c972e -s ours am: f26ff2a51b -s ours am: 4bd5daf191 -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: Ic54cdef1e35ae27dd22edbd5d2c5fc5191eabe5f
Signed-off-by: Automerger Merge Worker <[email protected]>