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: Ia64b2c250ea3a3f55b7cfb745ef87acdc48a24bd