Merge "binderRpcTest: undo ThreadPoolLimit optimization" am: 00be693277 am: fd4af96f11

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

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