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

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

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