Merge "mainline:Replace serviceState.getDataRegState and getVoiceRegState"
am: a5dd35d6c0

Change-Id: I481ed88007c22c49b236463a5f8402102299574f