[automerger skipped] Merge "[CDM] Make CDM transport APIs available to the...

[automerger skipped] Merge "[CDM] Make CDM transport APIs available to the system services" into udc-dev-plus-aosp am: 442e30b8 am: 995a9c55 am: 8902ac85 -s ours

am skip reason: Merged-In If709de4f717546f3706bf08fd098b0dc78b61a44 with SHA-1 9e127704 is already in history

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



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