Merge "Change the ownership of CDM" into rvc-dev am: 231a42b77e am: 21886570d2 am: 3bfbd4b740 am: 39fb1e2203 am: 1d9475c54e am: 1d8bf46cb2

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

Change-Id: If80093e6a373880a96d01bff72af33e69bb94db1