[automerger skipped] Merge "Log whenever face or fp enrollment state changes, and when trust usually managed state changes" into udc-dev am: 5577073f am: 2c2c0fd7 -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/+/21693343



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