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

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

Change-Id: I6636674d0c68dbb2fece80e4fba6dc6ce7e7e370