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

Change-Id: I972571956394d81619edae2a0450dd36a68b0236