Merge "Make dun APNs as read-only by default." into oc-dr1-dev
am: 730e4a5651

Change-Id: Iab30ea34531682e9e4212aa8930232121aa530bd