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

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