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

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

Change-Id: I52413f636dc427bd4568eb1bdd3db9da65f020ec