Merge "[conflict] Merge "Rename BiometricRepository to BiometricSettingsRepository." into tm-qpr-dev am: e9dce6e327 am: 8990f8eebf"