[automerger skipped] Merge TP1A.221105.002 to aosp-master - DO NOT MERGE am: bca43fa152 -s ours am: 5d258c9556 -s ours am: cef7ebc539 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2294418

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