Merge "Ensure created fd being closed" am: 5b98fb05d6 am: f09b6f6414 am: be2d19fd2a

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

Change-Id: If013f0c6573ccf6469d4c7e1b639215ccdbd9c76