Merge "Make dun APNs as read-only by default." am: 6645fdad68
am: be8044de83

Change-Id: I4a1c985a165ba0337216e3d873ad3c863a1e4d0b