Merge "When SPN is empty, use PNN in mobile network settings" into qt-qpr1-dev am: eae359df70
am: b016c57ff3

Change-Id: Ib58a40f425a402ce332424e2175185676d23b903