Just to confirm, we still want to keep the send feedback button in the help activity, right?

For the internal Help implementation, I don't know if we can control the Feedback button. I think the extra redundancy is fine here.

However, you will need a separate method to implement the "Feedback" item in the side drawer. I think you'll need to adjust the HelpAndFeedback interface:
https://cs.chromium.org/chromium/src/remoting/android/java/src/org/chromium/chromoting/help/HelpAndFeedback.java

To do this without breaking internal builders, you might need to do this in 3 steps:

1. Internally: disable compilation of the internal implementation and have the internal build use the public implementation instead.
2. Publicly: Update the interface, and the public implementation.
3. Internally: re-enable compilation and update the implementation to use the new interface.
 

If the only change to the interface is just adding `launchFeedback()` then maybe we can implement it on internal without @Override first then add it back after we got the public implementation.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/8ec3ca27163b6e932a03a304e0a7aad7d6a884e4

commit 8ec3ca27163b6e932a03a304e0a7aad7d6a884e4
Author: yuweih <yuweih@chromium.org>
Date: Thu Sep 29 02:00:26 2016

[Remoting Android] Separate help and feedback in navigation drawer

This CL separates the help and feedback items in the navigation drawer
according to the UX review feedback.

BUG= 650813 

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

[modify] https://crrev.com/8ec3ca27163b6e932a03a304e0a7aad7d6a884e4/remoting/android/client_java_tmpl.gni
[add] https://crrev.com/8ec3ca27163b6e932a03a304e0a7aad7d6a884e4/remoting/android/java/res/drawable-hdpi/ic_announcement.png
[add] https://crrev.com/8ec3ca27163b6e932a03a304e0a7aad7d6a884e4/remoting/android/java/res/drawable-mdpi/ic_announcement.png
[add] https://crrev.com/8ec3ca27163b6e932a03a304e0a7aad7d6a884e4/remoting/android/java/res/drawable-xhdpi/ic_announcement.png
[add] https://crrev.com/8ec3ca27163b6e932a03a304e0a7aad7d6a884e4/remoting/android/java/res/drawable-xxhdpi/ic_announcement.png
[add] https://crrev.com/8ec3ca27163b6e932a03a304e0a7aad7d6a884e4/remoting/android/java/res/drawable-xxxhdpi/ic_announcement.png
[add] https://crrev.com/8ec3ca27163b6e932a03a304e0a7aad7d6a884e4/remoting/android/java/res/menu/feedback_list_item.xml
[modify] https://crrev.com/8ec3ca27163b6e932a03a304e0a7aad7d6a884e4/remoting/android/java/src/org/chromium/chromoting/Chromoting.java
[modify] https://crrev.com/8ec3ca27163b6e932a03a304e0a7aad7d6a884e4/remoting/android/java/src/org/chromium/chromoting/NavigationMenuAdapter.java
[add] https://crrev.com/8ec3ca27163b6e932a03a304e0a7aad7d6a884e4/remoting/android/java/src/org/chromium/chromoting/help/FeedbackSender.java
[modify] https://crrev.com/8ec3ca27163b6e932a03a304e0a7aad7d6a884e4/remoting/android/java/src/org/chromium/chromoting/help/HelpActivity.java
[modify] https://crrev.com/8ec3ca27163b6e932a03a304e0a7aad7d6a884e4/remoting/resources/remoting_strings.grd

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/chrome/src-internal.git/+/d934681896432747810dd344aefa04f7277e35fb

commit d934681896432747810dd344aefa04f7277e35fb
Author: Yuwei Huang <yuweih@chromium.org>
Date: Fri Sep 30 17:44:52 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/c2ca6de891a0fe550ce2ea9b0392d6b4f6f457f3

commit c2ca6de891a0fe550ce2ea9b0392d6b4f6f457f3
Author: yuweih <yuweih@chromium.org>
Date: Mon Oct 03 20:57:54 2016

[Remoting Android] use HelpAndFeedback.launchFeedback to launch the feedback activity

Step 3/4 of separating feedback and help in the navigation menu.

BUG= 650813 

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

[modify] https://crrev.com/c2ca6de891a0fe550ce2ea9b0392d6b4f6f457f3/remoting/android/java/src/org/chromium/chromoting/NavigationMenuAdapter.java
[modify] https://crrev.com/c2ca6de891a0fe550ce2ea9b0392d6b4f6f457f3/remoting/android/java/src/org/chromium/chromoting/help/HelpAndFeedback.java
[modify] https://crrev.com/c2ca6de891a0fe550ce2ea9b0392d6b4f6f457f3/remoting/android/java/src/org/chromium/chromoting/help/HelpAndFeedbackBasic.java

Help and Feedback are now separate items. Verified in 55.0.2882.0