Merge cherrypicks of [20037728] into sc-v2-platform-release. am: 35f35a9aa1

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

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