Merge "New internal permission to protect apps against rogue Nfc message." into mnc-dev