Merge "Fixed the incorrect APN dedupling" into tm-dev am: 596ddbac am: 1e35e37d am: 321baa8a

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



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