Merge "Factor out common PowerStatsCollector / PowerStats HAL integration code" into main