Merge "Merge "Make dun APNs as read-only by default." am: 6645fdad68 am: be8044de83 am: 0e3b00f8b3 am: 066f35d10b" into oc-mr1-dev-plus-aosp