am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread

Merge commit '1f90908c19ab24791bd54c856b32bb12682496eb' into gingerbread-plus-aosp

* commit '1f90908c19ab24791bd54c856b32bb12682496eb':
  Prevent use of NFC api if device is not featurized for NFC.