Merge "libbinder: single-threaded binderRpcTest cleanup" am: 2bb747d365 am: c5c8272dee

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

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