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

Change-Id: I6b045ac52a5ad4b97b8b2fa231ecbb713faf8df8