Merge changes I9115b707,I1912b8ad into main

* changes:
  Report primary auth attempts from LockSettingsService
  Add flag for reporting primary auth attempts from LockSettingsService