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

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

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