Merge "Fixed incorrect metered/unmetered APN in AP-assisted mode"
am: 5793970d30

Change-Id: I723d567d714ef01ccc4cca2e52c7880432fca154