am 8fb8c37c: am 7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev

* commit '8fb8c37ca7c2c57466b07548effa24044e5b3ef6':
  Adding config to allow/disallow user to add APNs.