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

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

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