Merge "[BugFix][Fingerprint]fix client was canceled by service by mistake" am: 72eda1bb48

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

Change-Id: I4172f144a1e4400cf8a23c1010dd6c54dea6727f