Merge changes from topics "niap-asym-write-pi-dev", "niap-asym-write-api-pi-dev" into pi-dev

* changes:
  Restore "Add "Unlocked device required" parameter to keys"
  Add "unlocked device required" API