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

Change-Id: I61cdd3c5c8fba049c6a3748dde196fe232ece20b