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

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

Change-Id: Iff46d20331a751780a13a384afb71cbaa628725f