[automerger skipped] Merge "Moved data settings to phone" am: fda37c33c3 am: 9769ce1600
am: fcf8dd2436  -s ours

Change-Id: I71b947bcbb392c90f82cd87cde08763e16414a3d