Merge "De-flake CpuPowerStatsCollectorTest#isolatedUidReuse" into main