Android U Beta 1 GPL
Merge "[automerger skipped] Merge Android 13 QPR1 am: ecc2784328 -s ours" into stage-aosp-master am: 3594f4949d -s ours

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

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

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