Merge "Revert "Have a new method in NetworkAgentConfig.Builder to set allowBypass"" into sc-dev