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