am 19964a1b: am 3cc84cb0: Merge "Change to preserve user/carrer added/edited APNs on upgrade." into mnc-dev

* commit '19964a1b3ec42b1e8c477dd85733828e0f9f013c':
  Change to preserve user/carrer added/edited APNs on upgrade.