Merge changes Id458f4e0,Id51aee37

* changes:
  mainline:Replace serviceState.getDataRegState and getVoiceRegState
  [Mainline] move ServiceStateProvider to TeleService