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