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 am: 995a9c55

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



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