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: 04900eb0 am: 9810f270 am: 1056976d

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



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