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

Change-Id: I211604542300c5e07637e923f9c20a8dcaf403ea