Merge "binderRpcTest: actually include strong count in leaked ref" am: 9df841c82c am: c2bb53032f

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

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