Merge "Fixed incorrect metered/unmetered APN in AP-assisted mode" into qt-dev
am: 09dce09755

Change-Id: I70e5c123688858c61bf1928276c3cf5828f13f26