Merge "Open up getCloudMediaProvider to mainline modules." into tm-dev