Merge "NetworkUtilsTest.testSetSockOptBytes" into main am: 24563fa502

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

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