Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev