[automerger skipped] Merge "mainline:Replace serviceState.getDataRegState with getDataRegistrationState" am: c5e7864948 am: ed119d3b0e am: d41ee5451c -s ours
am skip reason: Change-Id I5a4a1a2b0dc5140257963651b69c0f427ef5ae93 with SHA-1 04673056d7 is in history

Change-Id: I33264e1444da951bbc4d524e31d033a75edfe937