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