Merge "Remove dead NFC unlock code from fw/base" into lmp-dev