Merge "Avoid using FileDescriptor#getInt$() on R" into main am: 3171a0bb8e

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

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