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

Change-Id: I59bb07aa3b49ab03ef4defa275d54af9643937cc