Merge "Enabling mediaprovider MTS tests to be included in android-mts-mediaprovider as well as android-mts."