[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 oc-mr1-dev am: 1a673296 -s ours am: 12e7baad -s ours am: 50472c1d -s ours am: 8fcc7fb7 -s ours am: 57ac383a -s ours am: b67c0f56 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8be0b700a0e54cc62f4e4411b36d51e01f01a493