[automerger skipped] Merge TP1A.221105.002 to aosp-master - DO NOT MERGE am: fafba401 -s ours

am skip reason: Merged-In I760ad49579961037628fde4d0300644aa2f6c188 with SHA-1 ca13cf73 is already in history

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



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