[Android] Further speculative fixes for search engine crashes.

[Android] Further speculative fixes for search engine crashes.

Noticed that the .equals for TemplateUrl was not including
the new fields added recently.  The previous CL was not
updating the search engines if they equalled, but that would
not work if the keywords changed, which is the key used
to query the backend.

This handles the null in cases we are aware of, logs information
that we can traige further, but should unblock custom search
engines on Android.

BUG=670250
Review-Url: https://codereview.chromium.org/2668593002
Cr-Commit-Position: refs/heads/master@{#447195}
(cherry picked from commit 14c9281bb6a538be7e6d7f278d4fea7d5e838d08)

Review-Url: https://codereview.chromium.org/2676443002 .
Cr-Commit-Position: refs/branch-heads/2987@{#258}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Committed: https://chromium.googlesource.com/chromium/src/+/3a2e7d7b51a3d44233591e67fb9285b29e9d5f5c

[Ted C, 2017-02-01 23:59:46]

Description was changed from

==========
[Android] Further speculative fixes for search engine crashes.

Noticed that the .equals for TemplateUrl was not including
the new fields added recently.  The previous CL was not
updating the search engines if they equalled, but that would
not work if the keywords changed, which is the key used
to query the backend.

This handles the null in cases we are aware of, logs information
that we can traige further, but should unblock custom search
engines on Android.

BUG=670250

Review-Url: https://codereview.chromium.org/2668593002
Cr-Commit-Position: refs/heads/master@{#447195}
(cherry picked from commit 14c9281bb6a538be7e6d7f278d4fea7d5e838d08)
==========

to

==========
[Android] Further speculative fixes for search engine crashes.

Noticed that the .equals for TemplateUrl was not including
the new fields added recently.  The previous CL was not
updating the search engines if they equalled, but that would
not work if the keywords changed, which is the key used
to query the backend.

This handles the null in cases we are aware of, logs information
that we can traige further, but should unblock custom search
engines on Android.

BUG=670250

Review-Url: https://codereview.chromium.org/2668593002
Cr-Commit-Position: refs/heads/master@{#447195}
(cherry picked from commit 14c9281bb6a538be7e6d7f278d4fea7d5e838d08)

Review-Url: https://codereview.chromium.org/2676443002 .
Cr-Commit-Position: refs/branch-heads/2987@{#258}
Cr-Branched-From:
ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Committed:
https://chromium.googlesource.com/chromium/src/+/3a2e7d7b51a3d44233591e67fb92...
==========

[Ted C, 2017-02-01 23:59:47]

Committed patchset #1 (id:1) manually as
3a2e7d7b51a3d44233591e67fb9285b29e9d5f5c.