Merge "Add CDM CTS test modules to Test-Mapping Presubmit"