Merge "CDM Transport clean-up" into udc-dev am: 9fe0570e am: 52b549b8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21585672



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