Merge "Fix testNetworkCachingOverflow failure in CellularNetworkValidatorTest" into main