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

Change-Id: Icf40ec83d25ec8057429e3b142fea6506f2ebe40