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

Change-Id: Id9b5838b388015301d8a92961cde18cb7140fb74