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

Change-Id: Idad859105ace2ebff0e6bcf4a52a1f672401daed