[automerger skipped] [BugFix][Fingerprint]fix client was canceled by service by mistake am: 16aa67ef am: 365df3bd am: fd569e18 -s ours

am skip reason: Change-Id I56ce99505febbb48dc13ccfc3c2d120123da4fa3 with SHA-1 802c0a76 is in history

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

Change-Id: I6b5dadf948c01849dccb647b5c2c7fd11eec9af3