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

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

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