Merge "Merge "Make dun APNs as read-only by default." am: 6645fdad am: be8044de am: 0e3b00f8 am: 066f35d1" into oc-mr1-dev-plus-aosp