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

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

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