Merge "Add BATTERY_STATS for DeviceDiagnostics." into main