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

Change-Id: I2105a8a26bc99469f45e7e3b0f8e2ba508d75752