Merge "Reclassify FGS and BOUND_TOP as "background" in BatteryUsageStats"