Merge "Set "Fi Network" SPN in default carrier config." am: d9a510dc01
am: da345d8f17

Change-Id: Id2fa290dc5be452a574d5e61b86382dcd1551fd9