Merge "Minor string updates to face unlock unavailable message" into...

Merge "Minor string updates to face unlock unavailable message" into tm-qpr-dev am: 44fd7e6c am: a53c0b1f

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



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