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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I159ddd2b64d144ca807bdd6aa70aca90d6466356