Merge "Ignore clicks on developer switch UI during monkey test" into oc-mr1-dev

src/com/android/settings/development/DevelopmentSettings.java

@@ -630,6 +630,9 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
             return;
         }
 
+        if (Utils.isMonkeyRunning()) {
+            return;
+        }
         mSwitchBar.addOnSwitchChangeListener(this);
     }
 

src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java

@@ -117,6 +117,9 @@ public class BuildNumberPreferenceController extends AbstractPreferenceControlle
         if (!TextUtils.equals(preference.getKey(), KEY_BUILD_NUMBER)) {
             return false;
         }
+        if (Utils.isMonkeyRunning()) {
+            return false;
+        }
         // Don't enable developer options for secondary users.
         if (!mUm.isAdminUser()) {
             mMetricsFeatureProvider.action(