Merge "Reduce risk of a long lock contention during getBatteryUsageStats" into main