Merge "Added new config to indicate read-only apn types." into nyc-mr1-dev am: 3dfd09e860
am: 94ca1c75a7

Change-Id: Ie4072f2ca2dd6dfe82f8df8597020f3cf5972ae5