Merge "Use end timestamp set in the future to query NetworkStats since boot" into main