Merge "Add support for setsockoptBytes" into main am: 38795d6f89 am: b4b16f7445

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

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