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

Change-Id: I5ed21994ef8719aa125cf20ede49b4e6c48c8c53