Merge "Update face unlocked string when a11y is enabled" into tm-qpr-dev am:...

Merge "Update face unlocked string when a11y is enabled" into tm-qpr-dev am: 081a7f7f am: 9cfab7d5

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



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