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

Merge "Merge "Change the ownership of CDM" into rvc-dev am: 231a42b7 am: 21886570 am: 3bfbd4b7 am: e84ac2fe am: 67f1666d" into sc-v2-dev-plus-aosp am: 93d2227a

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

Change-Id: I6baa7e8f95e06d224febb5656b6dea3496187f86