Merge "When SPN is empty, use PNN in mobile network settings"
am: 39424f4b70

Change-Id: I48125020e0332316ba986f011bc7cee0b9df258d