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

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



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