Merge "Change the ownership of CDM" into rvc-dev am: 231a42b77e am: 7522db5bd0 am: 67179b8e4f am: 6a50b1c077 am: eccb58cb92
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15779907 Change-Id: Iac76e67a1773acf486ab8ed38bd5c0b61c20026f
This commit is contained in: