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: 9d8ac526 am: 1c90085f am: 8dc31ccc

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



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