Merge "Change the ownership of CDM" into rvc-dev am: 231a42b77e am: 21886570d2 am: 3bfbd4b740 am: e84ac2fe0d am: 67f1666d74

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

Change-Id: Ie20efa3ffa7b35dcaacf5fb0db00e298648668d9