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

Change-Id: I4716ad78b0081e0032a5bad572a490744325ec0a