Merge "A few improvements on CtsContentCaptureServiceTestCases."