Merge "CDM Transport clean-up" into udc-dev am: 9fe0570eea

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

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