[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into rvc-dev am: 7944148774 am: f566c3611e -s ours

am skip reason: Change-Id Ie5a0f8c3e9b92d348a78678a6ed192d440c45ffc with SHA-1 09c1b8ebf9 is in history

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

Change-Id: I7ad347bc6f8ffe575e9fe935ba9adbb54785017a