am d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev
am d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev

* commit 'd846490a560122f9dd67d863da9ebddf81e15ba2':
  Add hidden API to disable NFC (optional persist).

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base