[automerger skipped] Merge "Fixed incorrect metered/unmetered APN in AP-assisted mode" am: 5793970d30 am: 67132a2674 -s ours
am: df3b950db8 -s ours
am skip reason: change_id I871026ee49f71f546bb96f6121d185f46594cadf with SHA1 41407eec57 is in history

Change-Id: Ic20f4f215456c071998dd4efc873db0aa739ab46