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: Ie214fc94b33c82dc0cd67ac9f5388b74fa1393aa