[automerger skipped] Merge QQ3A.200605.002 into master am: f671eefd76 -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: Ia5170e5cc6451c70e46a29528031f899ea24479b