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

Change-Id: I694cb96db9ebb8258bb2c423e6c04133b747f1c8