Merge changes I488715c8,I2333568d,Iea68a8d3 into main

* changes:
  Share UID mapping logic between BatteryStats and PowerStatCollectors
  Export aggregated PowerStats as BatteryUsageStats
  Untangle circular dependency between BatteryStats and BatteryUsageStatsProvider