[automerger skipped] Merge QQ3A.200605.002 into master am: f671eefd76 -s ours am: c782df5d7c -s ours am: 1c9695398b -s ours am: ca5ec50b2b -s ours

am skip reason: Change-Id I470b39290db53f496c2328e196ddfcf82a3b3ada with SHA-1 8dacc4102d is in history

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

Change-Id: I78d7dee34039ea8abe0ef6d70e3a9b03f9bb1554