Merge changes I20d209b6,Ia9a33053 into main

* changes:
  Improve the LockSettingsService class comment
  LockSettingsService: remove TODO for getCredentialTypeInternal()