Merge "Added new config to indicate read-only apn types." into nyc-mr1-dev