tree b96ee8b826da69869e2aaf557f3fbb97f138b9b1
parent 2a91d99f587a1e99fcc4395c0b740962697c0997
parent a2b0289632e04863c7524eb47e6dc799da846712
author Xin Li <delphij@google.com> 1633683603 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683603 +0000

[automerger skipped] Merge Android 12 am: 5bd20529ad -s ours am: 74ff3cace3 -s ours am: ae4879fe51 -s ours am: cf00986e98 -s ours am: a2b0289632 -s ours

am skip reason: Merged-In I48d9475f853956c601a8a88adf01e5f4ee67c1fe with SHA-1 d9994bdea0 is already in history

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

Change-Id: If9f64bbfa69fa1728c5f514918642c04612b533f