[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into qt-qpr1-dev am: f228451841 -s ours am: fc7b7755ca -s ours am: f8e573fff3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If2764d3abd7d97b97944802eeecd9694f6e8a2e3