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

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

Change-Id: Ic3accb191a849151cac002f4fa7a2974543000f5