[automerger skipped] Merge "mainline:Replace serviceState.getDataRegState and getVoiceRegState" am: a5dd35d6c0 am: 8ccf79a098 am: e7575f77ce -s ours
am skip reason: Change-Id I0cbdfd5d3de3a78326703ede1640f01430bae18a with SHA-1 2670cba687 is in history

Change-Id: I8f1bf09e739e0c86db3e9ee80fca38d5c1cbc46b