Merge "Add new database table and proto for battery usage reattribution (2/5)" into main