[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 90db90c712 -s ours am: 20c86b7edf -s ours

am skip reason: Merged-In Ie8c226d9e7d1d0dc481d026ccd454a1db46fb915 with SHA-1 eb1937ebc4 is already in history

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

Change-Id: I6d8c23f77a7f03625833278560cd014e68ad5104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>