Merge "[DO NOT MERGE] Added CTS test for media provider case" into nyc-dev
am: 31fd5bff1d

Change-Id: Ib152057a4c2b086290e505b45fcd2800c67b5474