Merge "Avoid fd to be closed by ParcelFileDescriptor's finalizer" into main am: ff9b941bcc

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

Change-Id: Ic811b3bf3adf335122b0d0c713c0d5a583cbff3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>