[automerger skipped] Merge "Log FP & face enrollment state only if it changes." into tm-qpr-dev am: b188d33e am: 9448570d -s ours am: abc36a70 -s ours

am skip reason: Merged-In I0e877bfe6869ddebf4f9879143ac4fb1f94920a1 with SHA-1 a0b735c2 is already in history

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



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