Merge "Change the ownership of CDM" into rvc-dev am: 231a42b77e am: 7522db5bd0 am: 67179b8e4f

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

Change-Id: I98443ac432ebbad1fd3d7b78047cc5cbbd6b1bf3