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

Change-Id: I26be36eb4a783d42c6cf60db6a8f7be67c157492