Merge "Improve the netink socket receive buffer ENOBUFS test." am: c30ed0775c

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

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