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

am skip reason: subject contains skip directive

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

Change-Id: Ic276d6b78f12163caaf916933929cfe0ea255d00