Merge changes I0b17b082,I894051ed,I662a5997 into main am: 6cda0a19bb am: 14b204d707 am: a23524bad8 am: dc5c2d983f am: 13a364e68b

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

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