Merge "Fix AppBatteryPreferenceTest flaky" into main