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

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

Change-Id: I85359fc17a71bee8e68c94ff0a799d621d033a81