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

Change-Id: If3a99426b3b287c54f01526a0f70b3cd239cd899