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

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

Change-Id: I87ff38c29a09178be6b2ab7cf0db617b9d1a4f30