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

Change-Id: I8dbc15bb01fc815aa9cde6fe332903d4166289e9