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

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



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