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

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

Change-Id: I93637742add5b1e2487923497f959c4d1c305c15