[automerger skipped] Merge TP1A.221005.003 am: 54e5a0fe80 am: 7181fcc55b -s ours am: cbd016332d -s ours

am skip reason: Merged-In If2ae7bf5758338e71c69067b371e6a0bfe83048f with SHA-1 7992e4aeb9 is already in history

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

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