[automerger skipped] Merge "Adopt prev preferred APN on APN reset" am:...

[automerger skipped] Merge "Adopt prev preferred APN on APN reset" am: 756f2eae am: ea229f93 am: 13a3bda5 am: b454fbfa -s ours am: 7e4a1b33 -s ours

am skip reason: Merged-In I27a9b62860a966ecfd84fc83ba70203136622ed0 with SHA-1 0c766cfc is already in history

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



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