[automerger skipped] Merge Android 13 QPR1 am: 4d2f46f0a0 -s ours am: b29bac41c7 -s ours am: 1f9c78ff56 -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: I4bd00e31a9a04cef4793076f6a4cb9b77ce85ab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>