[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 pi-dev am: ade9bc9a -s ours am: 8df04e39 -s ours

am skip reason: Change-Id Iee6af379515385777984da55048c1efd9339ed88 with SHA-1 be924dac is in history

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

Change-Id: I63402887367ead56cfbbe380bfba4ef7f34612f3