Merge cherrypicks of [20053108] into rvc-platform-release. am: bc811e6fec

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

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