Merge "move ServiceState.getDataRegState to greylist"
am: 607e797932

Change-Id: I7d63f204bb34e462039d3889d1876b3264d0f567