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

Change-Id: I141ecc629c9795bc321bda0f96edcfe38868bfd6