[automerger skipped] Merge "Merge Android 12 QPR 3" am: 91c2117f -s ours

am skip reason: Merged-In I49d7623a21508cc57683f4853b22994e83116303 with SHA-1 388494bd is already in history

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



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