Merge "Re-activate and fix SocketOptions test for SO_RCVBUF." am: 05f7cc03cf

Original change: https://android-review.googlesource.com/c/platform/libcore/+/1979481

Change-Id: Ib1710841e496e461078a2d98b11299167e17516a