[automerger skipped] Merge "When SPN is empty, use PNN in mobile network...

[automerger skipped] Merge "When SPN is empty, use PNN in mobile network settings" am: 39424f4b am: 1df97d41 -s ours am: 6c0a4364 -s ours
am skip reason: Change-Id I2ef14204d0db018e7f67578a57e56fdbea8b698c with SHA-1 9d95aff9 is in history

Change-Id: I213c1fffc25edee82663f0198252a27d917cf69a