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

Change-Id: Ia447fe7a1db8a1399283998eb6dfc709a340f4af