[automerger skipped] Merge "Change the AndroidTest.xml of TelephonyProvider to support AndroidJUnitRunner." am: e2818d8ad0 am: 2d4fc9e73f
am: 0c777c7853  -s ours

Change-Id: Id7faace4ee889228e7e802296fc25a5c1c72e261