Merge "[Settings] Replacing accessing of PhoneConstants$DataState"