Merge "Add new strings that are shown when the user is asked to enter...

Merge "Add new strings that are shown when the user is asked to enter pin/pattern/password instead of biometrics" into udc-dev am: b96e6395 am: 210491a0

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



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