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

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



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