Also fix some libaddressinput dependencies/includes which incorrectly used ENABLE_AUTOFILL_DIALOG (since libaddressinput is used for chrome://settings/autofill regardless of the use of the dialog).

Also move some color constants closer to where they're used for the card unmask dialog.

BUG=337587, 608824
TBR=palmer@chromium.org

Review-Url: https://codereview.chromium.org/1931043002
Cr-Commit-Position: refs/heads/master@{#391821}