Merge "Re-enabled testGetContentCapture_disabledWhenNoService"