am 57f605f8: am a136f8d7: am c54bcade: Merge "New internal permission to protect apps against rogue Nfc message." into mnc-dev
am 57f605f8: am a136f8d7: am c54bcade: Merge "New internal permission to protect apps against rogue Nfc message." into mnc-dev

* commit '57f605f82b6ebf87bd9e7f2def4a082ab06a4556':
  New internal permission to protect apps against rogue Nfc message.

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