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

am skip reason: Change-Id I1241a12eafa0bdbac59a8ddd4cf6a0637d467b19 with SHA-1 1ba154b1 is in history

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

Change-Id: I0855583d84b4c299f7a062a9afeda7392fa257ce