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: 6af2fb85 am: b73bfeb0

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



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