Merge "Add CTS tests for LocalSocket read/write timeouts" into nyc-mr1-dev am: cd198fbef3
am: 5cc207a964

Change-Id: I314add4903640cd2700e40d01bcc6081e14cc168