[automerger skipped] Merge "Fixed the incorrect APN dedupling" am: e644644d...

[automerger skipped] Merge "Fixed the incorrect APN dedupling" am: e644644d am: c951b396 -s ours am: 74bc6f91 -s ours am: 03f6d072 -s ours am: de4c5eca -s ours

am skip reason: Merged-In Ie03959e317d11e906e2f72833255a29c96920890 with SHA-1 a71c90d8 is already in history

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



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