[automerger skipped] Merge "Should not try IMS or EMERGENCY APN for...

[automerger skipped] Merge "Should not try IMS or EMERGENCY APN for initial-attach." am: df7fddd9 am: 48bd4815 -s ours am: 4120a8bd -s ours am: f90c022d -s ours

am skip reason: Merged-In Ic5e449e514a996f90b815e56fe136ac1f453496e with SHA-1 77f9e2ad is already in history

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

Change-Id: Ie59a98817b142f5454fbc03f2eedbf4ae32a5781