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

Change-Id: I70ed56af355b7bd18d31f053fe009727d15b69c8