Merge "[Mainline] move ServiceStateProvider to TeleService"