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

Change-Id: I9faf26f0cde2e5c41e770aca5c2e768bbc41d26f