Merge "[automerger skipped] Merge "DO NOT MERGE Check fingerprint client...

Merge "[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into pi-dev am: ade9bc9a -s ours am: 8df04e39 -s ours am: dc9d907b -s ours am: a82898ba -s ours am: 66a17436 -s ours am: c66d66a3 -s ours" into rvc-qpr-dev-plus-aosp am: 1fb15670 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8f2ace57ff1e798508459a3749a2d3106c885bfe