Merge "[Settings] Replacing accessing of PhoneConstants$DataState" am: e9324b48ab am: 96e43012a1

Change-Id: I82f77b82685111e05235e8b4bdc03efe469c23bc