Merge "Ensure created fd being closed" am: 5b98fb05d6 am: fb11e19cb6

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1904462

Change-Id: If6a391d3397cf8f7890b5dc1597607cfec88baa8