Merge "[automerger skipped] Merge "Fixed the incorrect APN dedupling" am: 25157d11 am: d8a8bdbf -s ours" into tm-dev-plus-aosp am: 890f8e2a -s ours am: fb726d57 -s ours

am skip reason: Merged-In I02190be62855f5f3b86c41677bbf7ff6a362e652 with SHA-1 1d470caa is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2094528



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