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 oc-mr1-dev am: 1a673296 -s ours am: 12e7baad -s ours am: 50472c1d -s ours am: 8fcc7fb7 -s ours am: 57ac383a -s ours am: 39d75b0e -s ours am: 8d6fe624 -s ours" into rvc-qpr-dev-plus-aosp am: 7286ea5c -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ibe6f005e367c2636d1edede69cb118f25d4e8f87