Merge changes from topic "am-b1be03bda51148b4a765c48e0da0ffbc" into rvc-qpr-dev-plus-aosp

* changes:
  [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: 5ba661a1 -s ours
  [automerger skipped] DO NOT MERGE Check fingerprint client against top activity in auth callback am: bb570654 am: bfd504c8 -s ours am: efa94e55 -s ours am: 6e185d5c -s ours am: fd1f963c -s ours am: 8f077190 -s ours am: beda396d -s ours am: ac318c81 -s ours am: fd72b7c3 -s ours