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

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

Change-Id: I09bb486cef2020367861edba8709f8d2a9ca2c21