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

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

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



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