Merge "binderRpcTest: named normal modes" am: 54916ea5b3 am: 61cd2a6c50

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

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