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

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.preferences;
 
 import android.annotation.SuppressLint;
 import android.app.Fragment;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ skipping 218 matching lines @@
     @VisibleForTesting
     public Fragment getFragmentForTest() {
         return getFragmentManager().findFragmentById(android.R.id.content);
     }
 
     @Override
     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);
+                Menu.NONE, R.id.menu_id_help_general, Menu.CATEGORY_SECONDARY, R.string.menu_help);
         help.setIcon(R.drawable.ic_help_and_feedback);
         return true;
     }
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         if (menu.size() == 1) {
             MenuItem item = menu.getItem(0);
             if (item.getIcon() != null) item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         }
@@ skipping 34 matching lines @@
         // This must be called after setContentView().
         // https://code.google.com/p/android/issues/detail?id=78819
         ViewCompat.postOnAnimation(getWindow().getDecorView(), new Runnable() {
             @Override
             public void run() {
                 setTheme(R.style.PreferencesTheme);
             }
         });
     }
 }