Merge "Change directory to where TelephonyProvider reads downloaded apns-conf.xml" am: 39e717c60a
am: e87a1e99e1

Change-Id: Ie69bff791669dc1fac8e8f8e09c31c98b9e784a8