Merge cherrypicks of [19669330] into rvc-platform-release. am: 26d9bd640a

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

Change-Id: Iccd70b272a822313ece628e0de367c31b0996a12
Signed-off-by: Automerger Merge Worker <[email protected]>