Socket: Integrate upstream changes from 8u121-b13

- Minor javadoc changes

Bug: 64065632
Test: m
Change-Id: Ib1a353252377d1b106dd086bfbf4a711cb10842e
1 file changed