[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: 8343decb -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ica781f67772c75b63cc37204f9e8dca33b5581f8