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

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

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