am 0ccef4d0: Merge "Apply implicit parent dependency when adding to PreferenceGroup" into klp-dev

* commit '0ccef4d00357275f3a492e10f4e88aaf4d9deec6':
  Apply implicit parent dependency when adding to PreferenceGroup

core/java/android/preference/PreferenceGroup.java

@@ -210,10 +210,7 @@ public abstract class PreferenceGroup extends Preference implements GenericInfla
      * @return Whether to allow adding the preference (true), or not (false).
      */
     protected boolean onPrepareAddPreference(Preference preference) {
-        if (!super.isEnabled()) {
-            preference.setEnabled(false);
-        }
-        
+        preference.onParentChanged(this, shouldDisableDependents());
         return true;
     }