Merge "Add android.hardware.nfc.any to NFC features." into oc-dev
am: e7def4e9e0

Change-Id: I4c40be1c19abbac0c0a3808126821ee35b0bf307