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

[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into qt-qpr1-dev am: f2284518 -s ours am: fc7b7755 -s ours am: 98d40c62 -s ours am: 6f07745c -s ours am: b69aaa7f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I559df65ccee1da0eee4516926f5edf03c59cbcb2