[automerger skipped] Change directory to where TelephonyProvider reads downloaded apns-conf.xml am: f519c7ad95  -s ours
am: 91c7fc9065  -s ours

Change-Id: I3f9d45977b5f64a07dfb82cd40f53c9d38e480ae