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

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

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