Merge "Log whenever face or fp enrollment state changes, and when trust...

Merge "Log whenever face or fp enrollment state changes, and when trust usually managed state changes" into tm-qpr-dev am: dcef8705

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



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