Merge "Default binderized implementation of android.hardware.nfc@1.0" am: a614ac0b88 am: b3bdadd0d0
am: 54e01deea2

Change-Id: I123665eb812c1b79704c993fae72fe2bdcf05345