Merge "Change the AndroidTest.xml of TelephonyProvider to support AndroidJUnitRunner."
am: e2818d8ad0

Change-Id: Iaa93597b0f334648ff83fa59441c64e56d72e294