Merge "Added new config to indicate uneditable APN fields." into nyc-mr1-dev
am: 3ef3f62fa5

Change-Id: I661a3dcd183b3a5d13b55ca2848aa166314293fc