Merge "Add the ProviderStatus CTS tests back" into mnc-dev