Merge "Add support for deleting APNs." am: 80178f441a am: 16982e4f79
am: 35c90eb26e

Change-Id: I5d63cc093f4857131e552b955cfa3bbd6aa980da