Merge "Remove old NFC unlock api" into lmp-dev