[automerger skipped] Merge "mainline:Replace serviceState.getDataRegState and getVoiceRegState" am: c46dfae4 am: 0341b5a3 am: ad7babba -s ours
am skip reason: Change-Id I9a064c250acbe57fb198ea4641837d99adb1931a with SHA-1 b098c2a0 is in history
Change-Id: Ib35523af90ad85c28b4145070acc22a6839886d9