Merge "[CDM] Make CDM transport APIs available to the system services" into...

Merge "[CDM] Make CDM transport APIs available to the system services" into udc-dev-plus-aosp am: 442e30b8

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



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