Merge "Pass VPN uid range to AutomaticOnOffKeepaliveTracker" into main