[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top...

[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into qt-dev am: 5f942018 -s ours am: e1192c36 -s ours am: dbf3ed5a -s ours am: 292c75a0 -s ours am: 27a37339 -s ours

am skip reason: Change-Id I9b242a9fee0acbfb430875061e2d809c00fe4b97 with SHA-1 ce0a50bc is in history

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

Change-Id: If7bbaaeac804d11272405511580224a06a318b32