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

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

Change-Id: I1ba849b0ec81f7ce59deadbb5e2fe3f2bd217129