Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer" am: cf09c64473 am: 934f40753c

Change-Id: I71d047b955cbb80519bca4cd15d4638dec3dc812