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

am skip reason: subject contains skip directive

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

Change-Id: Id17cc093a4a70a32162331935d6f12fc4decf99c