Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer"
am: 7fd95f64df

Change-Id: Ifc07007c5bdf74199c7618fa089745eab99f95be