Merge "Fixed the incorrect APN dedupling" into tm-dev am: 596ddbac am:...

Merge "Fixed the incorrect APN dedupling" into tm-dev am: 596ddbac am: c121ff8e am: 03af068d am: 73d7fb24

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17928628



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