Merge changes from topic "kchyn-unicorn4a" into sc-dev

* changes:
  Show biometric-specific dialog when appropriate
  Add biometric strings to DeviceAdminStringProviderImpl