[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into rvc-dev am: 7944148774 am: e84b783bf4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I38c881b579b6892bf1494d84639b746ea32d9bf2