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

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

Change-Id: Ib45d6318ab0bf7150ceb6f4c2b8d256c2c0c1c7a