Merge cherrypicks of [20035119] into sc-platform-release. am: f88648ad9e

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

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