[automerger skipped] Merge "Fixed incorrect metered/unmetered APN in AP-assisted mode" am: 1f520cee
am: 60813cb1 -s ours
am skip reason: change_id I6947e9ba9a461484c25ca884048939724be7ce30 with SHA1 552fc09c is in history
Change-Id: Ic6c800d8bb6fdb73e675c37a843a760aaf18b5db