[Merge M60][Payments] Do not select an address if the merchant doesn't support it

[Merge M60][Payments] Do not select an address if the merchant doesn't support it

Bug: 728770
Test: browser_tests
Change-Id: I5aa86e332faa75a100cf403d08b3bf096a3c62f4
Reviewed-on: https://chromium-review.googlesource.com/521709
Commit-Queue: Mathieu Perreault <mathp@chromium.org>;
Reviewed-by: Anthony Vallee-Dubois <anthonyvd@chromium.org>;
Cr-Original-Commit-Position: refs/heads/master@{#476648}
Review-Url: https://codereview.chromium.org/2923533002 .
Cr-Commit-Position: refs/branch-heads/3112@{#144}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}
Committed: https://chromium.googlesource.com/chromium/src/+/b322814157e8187d060b875ba432c760e768f0cb

[Mathieu, 2017-06-05 12:46:31]

Description was changed from

==========
[Merge M60][Payments] Do not select an address if the merchant doesn't support
it

Bug: 728770
Test: browser_tests
Change-Id: I5aa86e332faa75a100cf403d08b3bf096a3c62f4
Reviewed-on: https://chromium-review.googlesource.com/521709
Commit-Queue: Mathieu Perreault <mathp@chromium.org>
Reviewed-by: Anthony Vallee-Dubois <anthonyvd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#476648}
(cherry picked from commit 04b4c66b52e636caee92c6e0788dbb17a639f96f)
==========

to

==========
[Merge M60][Payments] Do not select an address if the merchant doesn't support
it

Bug: 728770
Test: browser_tests
Change-Id: I5aa86e332faa75a100cf403d08b3bf096a3c62f4
Reviewed-on: https://chromium-review.googlesource.com/521709
Commit-Queue: Mathieu Perreault <mathp@chromium.org>
Reviewed-by: Anthony Vallee-Dubois <anthonyvd@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#476648}
Review-Url: https://codereview.chromium.org/2923533002 .
Cr-Commit-Position: refs/branch-heads/3112@{#144}
Cr-Branched-From:
b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}
Committed:
https://chromium.googlesource.com/chromium/src/+/b322814157e8187d060b875ba432...
==========

[Mathieu, 2017-06-05 12:46:32]

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