Merge "Add "close" socket option for immediately close socket after finish check captive portal." am: 5751278992
am: b697d85c60

Change-Id: Id7f0198771a3da31b577e64da2816bc61c2e04cd