Merge "Change the ownership of CDM" into rvc-dev am: 231a42b77e am: 21886570d2 am: 3bfbd4b740

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

Change-Id: I490f79064c5da308051b9c0556be03fe309a513c