[automerger skipped] Merge "[BugFix][Fingerprint]fix client was canceled by...

[automerger skipped] Merge "[BugFix][Fingerprint]fix client was canceled by service by mistake" am: 72eda1bb am: 5bfd8bcc -s ours

am skip reason: Change-Id I56ce99505febbb48dc13ccfc3c2d120123da4fa3 with SHA-1 16aa67ef is in history

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

Change-Id: I137fa1aadbcf876b320087836c230aee49552b2e