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 udc-dev am: 5577073f

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



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