Merge "Fixed incorrect metered/unmetered APN in AP-assisted mode"
am: 149edbd87b

Change-Id: Ia204a5ceebfc97f0f15cae94b1ec4f4aca78c231