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

Change-Id: Ia13ef9ace87103842c8159ccd801c6db3ac69156