Merge "Fix b/261390301: NullPointerException at BatteryChartPreferenceController.addAllPreferences()"