am 51139585: am 1dff0185: am 2d22fa9b: am 2e4ce593: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev

* commit '51139585f666479d0b9bbb9a5936c3ce2509f785':