Merge "Validate cellular network in testSetAvoidUnvalidated() for accurate testing" into main