Merge "Switched face acquire strings" into tm-d1-dev am: 847661eb am: 67ea0a0b

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



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