Merge changes I6a6916fd,Ia7fdd0c8,Id2e73b83,If3e00d82,Ia7eb62d6 into tm-qpr-dev

* changes:
  [SB Refactor] Support network names for carrier merged.
  [SB Refactor] Cleanups in the carrier merged connection repo.
  [SB Refactor] Don't update the network name if the subId doesn't match.
  [SB Refactor] Supprt activity in/out for carrier merged connections.
  [SB Refactor] Make demo wifi's activity always non-null.