Merge "Fixed FaceProvider logging." into tm-qpr-dev am: 1bb0afbd am: e8b0dc6c

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



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