am 9845d105: am e60989be: am fe6938e0: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev

* commit '9845d105b4b2d40e15091a2e062fd80d98cd37f1':