Merge "Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted...

Merge "Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 5d50d79f am: 5c880142 am: 1fc2d0b1  -s ours am: 2dcc64f6 am: d677e8d413 am: abc6ebd6 am: 05cd9942d9  -s ours am: 34cdf165 am: 981146d7" into nyc-mr1-dev-plus-aosp
am: 79c7e5c3  -s ours

Change-Id: I1c57481cc73f96528675b32525472ef587c17b88