Merge "Remove <sys/socket.h> inlines for obsolete API levels." am: f2ca0bc13d

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2454908

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