Merge "Change the ownership of CDM" into rvc-dev am: 231a42b77e am: 21886570d2

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

Change-Id: Ibdb21157823b98cc976aa7801fd1a4ecd0dcd1ed