Merge "Fix biometrics unicorn consent string bug." into udc-dev am: ad5954bc94
am: cc0d6acce1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22578994 Change-Id: I6b1584165e04ec492a488df2f612cd4cc8576f95 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: