Merge "Change the ownership of CDM" into rvc-dev am: 231a42b7 am: 7522db5b...

Merge "Change the ownership of CDM" into rvc-dev am: 231a42b7 am: 7522db5b am: 67179b8e am: ba341f59

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

Change-Id: I54f7d016ce768d0fcbf911e7d33cb7a7e9885cfc