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

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

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