[automerger skipped] Merge "Merge Android 13 QPR1" am: 68ebeac829 -s ours am: 8cfb592530 -s ours am: b0da7ac627 -s ours

am skip reason: Merged-In Ie82f2c3efcc88d788f6e914ae37b6a9d38955cb5 with SHA-1 fa6cbb870b is already in history

Original change: https://android-review.googlesource.com/c/device/common/+/2336993

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