Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer" am: b2ff467a3a am: b5d058e25d am: 0fee898931

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