Merge "Fix NPE in InstantAppButtonsPreferenceController"

tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java

@@ -179,6 +179,15 @@ public class InstantAppButtonsPreferenceControllerTest {
         verify(menuItem, never()).setEnabled(false);
     }
 
+    @Test
+    public void onPrepareOptionsMenu_installMenuNotFound_shoulNotCrash() {
+        final Menu menu = mock(Menu.class);
+
+        mController.onPrepareOptionsMenu(menu);
+
+        // no crash
+    }
+
     @Test
     public void onOptionsItemSelected_shouldOpenAppStore() {
         final ResolveInfo resolveInfo = mock(ResolveInfo.class);