Merge "Add MainlineTestModuleController to CtsNetTestCases" into tm-dev