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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21008159

Change-Id: I1d239c48bb55742c08059b2e15543c58a8649a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>