Merge "Mark TelephonyProviderTest with @SmallTest" am: 613d5b36f0
am: f71c395c83

Change-Id: I36c93bdb9446c57c27b86e181cc8ef14ab34c6cd