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

Change-Id: Ia8568f8527ef66c49b37deacc8b04c289b692300