Merge "use the default binder/passthrough mode in NFC VTS test."
am: 5c959c69dc

Change-Id: I3d7a7f56efbdabd89f9f5c3f304b04bb7aa4a88e