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

Change-Id: Id78eca98cc8a4f545d2aa5198076c6067a1b44b9