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

Change-Id: I9aee20185e189e51d537b6b0895fdc31c31d0ea2