Merge changes I17feaab5,I4157a1c5 into main

* changes:
  Add flag for auto data switch rat and ss
  Consider roaming when auto switch