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

[automerger skipped] DO NOT MERGE Check fingerprint client against top activity in auth callback am: bb570654 am: bfd504c8 -s ours am: efa94e55 -s ours am: 6e185d5c -s ours am: fd1f963c -s ours

am skip reason: Change-Id I0707c3f55eaf2a69c6625a3ceb3b5626b3676b26 with SHA-1 7786f490 is in history

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

Change-Id: I6e2582d9e3d89e65721b1252c4cefab62b407d20