[automerger skipped] Merge "Merge Android 13 QPR2" am: eb2ad4b0 -s ours am: b9f34c8e -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: I13492b572b02c148a7c24182e5ec71bebe705c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>