Merge "Fix mismatched state between SystemUI and FingerprintService" into sc-v2-dev am: 255aae7392

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

Change-Id: I3b25cc962374df059ac5c52e0aa654602cd4c3c4