Fix broken variations fetching on Android due to ToS pref.

Fix broken variations fetching on Android due to ToS pref.

In some cases, we've observed the ToS prefs to not be set at all
after a backup and restore scenario, yet with the FRE not being
shown. This CL attempts to fix those by ensure ToS prefs are set
if FRE is marked as completed.

BUG=708302
Review-Url: https://codereview.chromium.org/2803473002
Cr-Commit-Position: refs/heads/master@{#461880}
(cherry picked from commit 2b81404991f0e44b9e87da014094819ca6dc1d08)

Review-Url: https://codereview.chromium.org/2802603004 .
Cr-Commit-Position: refs/branch-heads/3029@{#590}
Cr-Branched-From: 939b32ee5ba05c396eef3fd992822fcca9a2e262-refs/heads/master@{#454471}
Committed: https://chromium.googlesource.com/chromium/src/+/d05425a9e6543d748ecd61d91c6a36ada225f06c

[Alexei Svitkine (slow), 2017-04-05 17:51:31]

Description was changed from

==========
Fix broken variations fetching on Android due to ToS pref.

In some cases, we've observed the ToS prefs to not be set at all
after a backup and restore scenario, yet with the FRE not being
shown. This CL attempts to fix those by ensure ToS prefs are set
if FRE is marked as completed.

BUG=708302

Review-Url: https://codereview.chromium.org/2803473002
Cr-Commit-Position: refs/heads/master@{#461880}
(cherry picked from commit 2b81404991f0e44b9e87da014094819ca6dc1d08)
==========

to

==========
Fix broken variations fetching on Android due to ToS pref.

In some cases, we've observed the ToS prefs to not be set at all
after a backup and restore scenario, yet with the FRE not being
shown. This CL attempts to fix those by ensure ToS prefs are set
if FRE is marked as completed.

BUG=708302

Review-Url: https://codereview.chromium.org/2803473002
Cr-Commit-Position: refs/heads/master@{#461880}
(cherry picked from commit 2b81404991f0e44b9e87da014094819ca6dc1d08)

Review-Url: https://codereview.chromium.org/2802603004 .
Cr-Commit-Position: refs/branch-heads/3029@{#590}
Cr-Branched-From:
939b32ee5ba05c396eef3fd992822fcca9a2e262-refs/heads/master@{#454471}
Committed:
https://chromium.googlesource.com/chromium/src/+/d05425a9e6543d748ecd61d91c6a...
==========

[Alexei Svitkine (slow), 2017-04-05 17:51:33]

Committed patchset #1 (id:1) manually as
d05425a9e6543d748ecd61d91c6a36ada225f06c.