[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: d9994bdea0 -s ours am: 696e4cbc72 -s ours am: 257ebdc301 -s ours

am skip reason: Merged-In If889d37eb0a4a280e5a371a10cd9d01e526a06d2 with SHA-1 96b06db837 is already in history

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

Change-Id: I0db5532fb059e6d2d908048f518899c65ba40316