[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: de1577c263 -s ours

am skip reason: Change-Id Icc69137c6d2e5118096a4f3661273d96952a18c6 with SHA-1 1eca8a5833 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66ac2369c33efd9cdfeffc0d4e4c27ebac7f62f3