[Android] Update Protected Media Identifier Settings UI to reflect exceptions.

chrome/android/java/src/org/chromium/chrome/browser/preferences/Preferences.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/Preferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Preferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/Preferences.java
index 5263580d5e95e891b6772f240e3fc27f6f5864db..a86987cbae7547c03f92dd77b2770faa6ee8fb94 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Preferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/Preferences.java
@@ -44,6 +44,9 @@ public abstract class Preferences extends ActionBarActivity implements
     public static final String EXTRA_SHOW_FRAGMENT_ARGUMENTS = "show_fragment_args";
     public static final String EXTRA_DISPLAY_HOME_AS_UP = "display_home_as_up";
 
+    // An arbitrarily large value as android.view.Menu does not have Last.
+    // TODO(knn): Update this once b/20478016 is resolved.
+    private static final int MENU_LAST = 100;
     private static final String TAG = "Preferences";
 
     /** The current instance of Preferences in the resumed state, if any. */
@@ -235,8 +238,8 @@ public abstract class Preferences extends ActionBarActivity implements
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
         // By default, every screen in Settings shows a "Help & feedback" menu item.
-        MenuItem help = menu.add(
-                Menu.NONE, R.id.menu_id_help_general, Menu.NONE, R.string.menu_help);
+        MenuItem help =

[newt (away), 2015/04/30 00:31:59]

How about using Menu.CATEGORY_SECONDARY and deleting MENU_LAST? e.g

    menu.add(Menu.NONE, R.id.menu_id_help_general, Menu.CATEGORY_SECONDARY,
R.string.menu_help);

[knn, 2015/04/30 16:00:36]

Indeed, Should've seen this. Thanks!

+                menu.add(Menu.NONE, R.id.menu_id_help_general, MENU_LAST, R.string.menu_help);
         help.setIcon(R.drawable.ic_help_and_feedback);
         return true;
     }