Merge "Fix biometrics unicorn consent string bug." into udc-dev am: ad5954bc am: e5946f68

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22578994



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