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

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

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