Merge "libbinder: RpcServer protocol version error" am: 2e96fc9754

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

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