[automerger skipped] Merge "Moved data settings to phone" am: bcd6a7db39
am: 67475a5c66
am: a91d29f5f0
-s ours
Change-Id: Ib7852dc376747b05a6e7ce1fb3391418d7ab01ef
This commit is contained in: