Merge "binderSafeInterfaceTest: over maxFds, not double" am: 6998244cf0 am: 88814971d5

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

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