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

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

Change-Id: I5cdb852fd6acc2e454aaa47554486cc115d131c5