Merge "Fix cancel not working for FingerprintDetectClient" into sc-dev am: c2a76f90 am: 54bca021 am: 98869c3d

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

Change-Id: Ie6069770775e9fb29db791707daeb6e6efeada8f