[automerger skipped] DO NOT MERGE Check fingerprint client against top activity in auth callback am: bb5706541d am: bfd504c81a -s ours am: efa94e557f -s ours am: 6e185d5cad -s ours am: fd1f963c32 -s ours am: 8f077190bd -s ours am: beda396d64 -s ours

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

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

Change-Id: I66d54b30d76a29a06c3344736c8b0dfe10373d79