[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-dev am: 4cf0088d am: a10d4f43 -s ours am: e422433a -s ours am: 62a47dcb -s ours am: d2cf9d9d -s ours am: 77579a97 -s ours am: e65d59eb -s ours am: 343b7884 -s ours am: 94fc18f3 -s ours am: 5fa9d66f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9b6f1fd5dbb142341967d633de79bafb716eccc7