Merge "Fix broken RoboTests in "com.android.settings.fuelgauge.*"" into main