tree b4a492a2879e8f46d621341d57801a7b85d7bac8
parent b1d3fbf39a0b04cba65e0364756d39a974d1ac9e
parent d8e81fb38998014da8392cbf65d28577c9bb74ca
author Xin Li <delphij@google.com> 1637143710 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637143710 +0000

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: f05b873ba6 -s ours am: d8e81fb389 -s ours

am skip reason: Merged-In I6074236616646db7bfda7ea381af7b04775a4263 with SHA-1 cf00986e98 is already in history

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

Change-Id: I282a2f01ca49081ac9e5b0ce8c3c4ee7276398a4