Merge "Fix cancel not working for FingerprintDetectClient" into sc-dev am: c2a76f90 am: 26ddb193

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

Change-Id: Id3b236011d381631b5a816c2ea80c36e768b52ee