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

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