Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32 am: 026b1b5df6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654

Change-Id: If46903bb26371ea90075d1c6cc063af4d10a88d4

src/com/android/settings/inputmethod/GameControllerPreferenceController.java

@@ -100,6 +100,11 @@ public class GameControllerPreferenceController extends TogglePreferenceControll
                 Settings.System.VIBRATE_INPUT_DEVICES, isChecked ? 1 : 0);
     }
 
+    @Override
+    public int getSliceHighlightMenuRes() {
+        return R.string.menu_key_system;
+    }
+
     @Override
     public void onInputDeviceAdded(int deviceId) {
         updateState(mPreference);

src/com/android/settings/inputmethod/OWNERS

@@ -1,5 +1,6 @@
 # Bug component: 34867
 include platform/frameworks/base:/services/core/java/com/android/server/inputmethod/OWNERS
+include /OWNERS
 
 # Settings for physical keyboard and game pad are better to be reviewed by the input team
 per-file GameControllerPreferenceController.java = file: platform/frameworks/base:/services/core/java/com/android/server/input/OWNERS