Merge "Add individual try/catch blocks for ParcelFileDescriptor closure" into main am: b62d79c423

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

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