[automerger skipped] Merge "Return message wrapped in Result from receiveMessage" into main am: b63454a -s ours am: 1d29833 -s ours

am skip reason: Merged-In Ic2285d38a2d0d2227c1fae92379270a5f52586c7 with SHA-1 0c25e86 is already in history

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

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

Author: Treehugger Robot