[automerger skipped] Merge "Fixed incorrect metered/unmetered APN in AP-assisted mode" am: 149edbd8
am: 019f54d3 -s ours
am skip reason: change_id Id1498fb8627dd7221a5ab7cde72929e6ee25b425 with SHA1 7ff7865d is in history
Change-Id: Iaf0a55bd6f394ab1a622eeb1764a5d0165273b23