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

Change-Id: I8c0763596690e810280c07cb6db61cda4dbc71ac