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