Merge TP1A.221005.003 am: 54e5a0fe80

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

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