Merge "Make WRITE_APN_SETTINGS a system-only permission."