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

Change-Id: If9b04ca42972c8bea3e9af1fd3ed0129be67505b