[automerger skipped] Merge "Moved data settings to phone" am: 9ceab92e6e am: 95712322df
am: dba27b47b1  -s ours

Change-Id: I4599d362939a073695f5a193fae1edca8b31e002