Merge changes from topic 'am-15128313c71649e3bd36a27ab8405fce' into nyc-mr1-dev-plus-aosp

* changes:
  Merge "Added new config to indicate uneditable APN fields." into nyc-mr1-dev am: 3ef3f62fa5 am: 9730f8bae2
  Added new config to indicate uneditable APN fields. am: 71e9ea6770 am: 49985fb986