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