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

Change-Id: I9aee20185e189e51d537b6b0895fdc31c31d0ea2
tree: 0fcda55147abcb956cdc5468064121badad252d7
  1. core/
  2. services/
  3. tests/