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

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

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



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