Merge change 21100 into donut

* changes:
  Use dataRoaming in dataConnectionTracker.