Merge "[Settings] Not allow APN delete when adding is not an option" into...

Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev am: 45051bb1 am: 6854fcd2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746893



Change-Id: I3642f8b2c2f2e1dcc518b000fc44917c9eeaff8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>