[automerger skipped] Merge "Should not try IMS or EMERGENCY APN for initial-attach." am: df7fddd96e am: 48bd481559 -s ours
am skip reason: Merged-In Ic5e449e514a996f90b815e56fe136ac1f453496e with SHA-1 77f9e2adfc is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709709
Change-Id: I786b1afd0c0e672c74505970d141a4a13464353d
This commit is contained in: