Merge "  Removed RingtoneManager obsolete DRM methods from CTS test.   Fixes bug b/10668217" into klp-dev