Merge "mainline:Replace serviceState.getDataRegState and getVoiceRegState"