Merge "Change the ownership of CDM" into rvc-dev am: 231a42b7 am: 7522db5b am: 67179b8e am: 6a50b1c0

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

Change-Id: Ide8206e767c960423b7c5bce2fc326f3c91a2da9