Merge "libbinder: RpcServer protocol version error" am: 2e96fc97 am:...

Merge "libbinder: RpcServer protocol version error" am: 2e96fc97 am: 5e2251df am: 5e783a87 am: f9afb139

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



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