[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 rvc-dev am: 79441487 am: f566c361 am: c790cbb8 -s ours

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

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

Change-Id: I9a0f53d418f08b303dbfed3ef6baf5dc61d0d225