[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into pi-dev am: ade9bc9a97 -s ours am: 8df04e3975 -s ours am: dc9d907b8f -s ours am: a82898ba34 -s ours am: 66a1743631 -s ours am: 0738b20f0e -s ours am: 5226023d21 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7c48fbfa57593a8f76dc97d97662ad41fe7b3328