Merge "mainline:Replace serviceState.getDataRegState with getDataRegistrationState"
am: c5e7864948

Change-Id: Ic443ccf38cf3630c6991118ff2cd3f02f6e18864