Merge "Mark TelephonyProviderTest with @SmallTest"