Merge changes I0b17b082,I894051ed,I662a5997 into main am: 6cda0a19bb

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

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