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

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

am skip reason: subject contains skip directive

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



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