[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 546bf09be0 -s ours am: 55b53f7de8 -s ours

am skip reason: Merged-In I1a17b0b27568a8e44a1b41b6336b39b064e66f24 with SHA-1 716d3a1fae is already in history

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

Change-Id: Ie65ef44251139a10994c6c38e5d380a3b80d3447