Merge "Change the ownership of CDM" into rvc-dev am: 231a42b7 am: 21886570 am: 3bfbd4b7

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

Change-Id: I2853cf911f56c27f5a51da667898d43926e816fb