Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into rvc-dev am: 7944148774 am: f566c3611e

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

Change-Id: I9243dcda31b67be22cd4fef10e90e4e31736436f