Update protobufs to match server side.

We've added a SendFeedback menu item for the feed cards which
requires syncing a protobuf format with the server.  The changes
have already been checked in on the server side, this changelist
adds them to the client side.


TGHis covers the following changes in the feed repo:
https://chromium.googlesource.com/feed/+/370d27850dbcb479bf0a3f98b6761dec40ef3ff1
https://chromium.googlesource.com/feed/+/8415ae95f9d6c4b1e8f118937743c6eec95bdf20
https://chromium.googlesource.com/feed/+/38557ae96b06ffa8ca52e56540e90ad4fb9b79c1
https://chromium.googlesource.com/feed/+/ce2ad93db4d120adac692c8b53cc9e574f51dfdd
https://chromium.googlesource.com/feed/+/b5279d539debbb6573592b8f28b80b292928a172
https://chromium.googlesource.com/feed/+/ebe07f69fec6980ee571771edd0d7ddf0c721880

Bug: 1040281
Change-Id: I58554c06980de3dfe500276cbc7bff2bf0bce211
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1993112Reviewed-by: Dan H <harringtond@chromium.org>
Commit-Queue: Peter Williamson <petewil@chromium.org>
Cr-Commit-Position: refs/heads/master@{#730023}

chrome/android/feed/merging.md

@@ -4,4 +4,4 @@
 and [feed wire protos](https://cs.chromium.org/chromium/src/components/feed/core/proto/wire/)
 are hand-merged from https://chromium.googlesource.com/feed regularly.
 
-Last merged Change-Id: I88bde10dbe068bec89b186097c262a89cf849689
+Last merged Change-Id: ebe07f69fec6980ee571771edd0d7ddf0c721880
\ No newline at end of file

components/feed/core/proto/ui/action/ui_feed_action.proto

@@ -30,7 +30,7 @@ message FeedAction {
 }
 
 // Metadata needed by the host to handle the action.
-// Next Id: 9
+// Next Id: 18
 message FeedActionMetadata {
   // The type of action, used by the host to perform any custom logic needed for
   // a specific type of action.
@@ -58,6 +58,7 @@ message FeedActionMetadata {
     SHOW_TOOLTIP = 14;
     NOT_INTERESTED_IN = 15;
     SEE_SUGGESTED_SITES = 16;
+    SEND_FEEDBACK = 17;
     reserved 9, 10;  // Deprecated
   }
   optional Type type = 1;

components/feed/core/proto/wire/capability.proto

@@ -12,7 +12,7 @@ option java_package = "org.chromium.components.feed.core.proto.wire";
 option java_outer_classname = "CapabilityProto";
 
 // Feature capability of either the client or the server.
-// Next ID: 12.
+// Next ID: 13.
 enum Capability {
   UNKNOWN_CAPABILITY = 0;
   BASE_UI = 1;
@@ -25,6 +25,7 @@ enum Capability {
   CAROUSELS = 9;
   ELEMENTS = 10;
   CONTENT_ID_UNIFICATION = 11;
+  SEND_FEEDBACK = 12;
 
   reserved 3;
 }