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

Change-Id: I12dba00e12c70dd10942435fca82ca3767804e0c