Merge "Added CTS test for media provider case"