[automerger skipped] DO NOT MERGE Check fingerprint client against top activity in auth callback am: 1ba154b14d am: 80de6140a1 -s ours am: 3e7bcb4519 -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: I0f485d6ddcb84fe53e8c43858fa9a8036877bf23