Merge "Fix return types of sendMessageOnSocket/receiveMessageFromSocket" am: b1815e3c39 am: e7854e1f5d

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2269886

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