Merge "move ServiceState.getDataRegState to greylist" am: 607e797932 am: 43640ec075
am: 94660fa63f

Change-Id: I83b299fc31a3a76ea0489588c0a44205825d5e28