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

am skip reason: Change-Id I98819fdf6fecfc95aa7c67892b02ceb897682f24 with SHA-1 b89321b762 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6f409355e32e4de868979e4dfc3ba26611d4889