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-dev am: f78ff48d  -s ours am: 7cd16688 am: a5e128ba am: 94c08c2b  -s ours am: d4fe2889 am: f6566193 am: 630d5773 am: c9830d56  -s ours am: c5442c26 am: b809b1f8 am: 0471ffa5 am: 0487464b" into nyc-mr1-dev-plus-aosp