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

Change-Id: I71d047b955cbb80519bca4cd15d4638dec3dc812