[automerger skipped] Merge Android 13 QPR2 am: 48ba26b4 -s ours am: 51161f4d -s ours

am skip reason: Merged-In I20a857714f506097c06cf8168b7ec368a3117612 with SHA-1 5ca47f57 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2486777



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