[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: f1d510cca0 -s ours am: c13941a760 -s ours am: 911ce8903f -s ours am: 61d279991b -s ours

am skip reason: Merged-In I1ec8d6440629e4198a5116641d9074906c6a5ebb with SHA-1 123007c428 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/trebuchet/+/17544699

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