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

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



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