[automerger skipped] DO NOT MERGE Check fingerprint client against top activity in auth callback am: 1ba154b14d am: 80de6140a1 am: 8452486b8c -s ours am: 11f5107a6b -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie4db7076cc376162083fb7dcd76630024fc1dcdf