Merge changes I6b780c1d,I238d963a,I32076c65 into main am: 51f1006440 am: dc59b8c5ce am: 15ee7e75ee

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

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