Merge "Do not call update() for read only APNs." into oc-dev
am: 8f18f8e087

Change-Id: I4afa467be33359cd09fde8d00b62fc299e01a85a