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

Change-Id: Ifae5a6889fc20bcd7f4269205c33e3e7fa6bd8f0