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

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

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