Merge changes from topic "wrap_fd_to_parcelfiledescriptor" am: f889ed7a30

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

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