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

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

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