Merge "Make dun APNs as read-only by default." into oc-dr1-dev
am: 730e4a5651

Change-Id: I9fff601c11c937d83f55275646ddf44a5bdf3acb