Merge "Log FP & face enrollment state only if it changes." into tm-qpr-dev am: b188d33e

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



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