Merge "Merge "Fixed the incorrect APN dedupling" into tm-dev am: 809036e6...

Merge "Merge "Fixed the incorrect APN dedupling" into tm-dev am: 809036e6 am: ff496fe7" into tm-d1-dev-plus-aosp am: b7ee5043 am: 74ac0df5

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



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