Merge "mainline:Replace serviceState.getDataRegState with getDataRegistrationState"