Merge "incidentd: dumping batterystats app data to proto"