[automerger skipped] Merge "Log whenever face or fp enrollment state changes,...

[automerger skipped] Merge "Log whenever face or fp enrollment state changes, and when trust usually managed state changes" into tm-qpr-dev am: dcef8705 am: 68ba3e5a -s ours

am skip reason: Merged-In I4db4a3bda7d86c56afbb79200f333d03b6075ba2 with SHA-1 91ec7717 is already in history

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



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