am b4589115: am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev

* commit 'b4589115ad5ca8a98aa8f9b75296502658ae6416':
  Remove dead NFC unlock code from fw/base