Merge "[conflict] Merge "Add new strings that are shown when the user is asked...

Merge "[conflict] 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" into udc-qpr-dev am: ec972ee5 am: ad904ead

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



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