Merge "binderRpcWireProtocolTest" am: b0a8f735ab am: efb14b5b81 am: 5d0ae1e843

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

Change-Id: Iea463ac3acbb1ab2c1d4987db25a023fe3fa229d