[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: 8f077190 -s ours am: beda396d -s ours am: ac318c81 -s ours am: 006fa980 -s ours am: 9ef738a4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I07111b07ff6403c86e44ac921a135f61985ce9ab