Revert "Unify and clarify divergent flows e.g. where augmented autofill or"

This reverts commit 6e954252709dd4747e496b6535a9ecac85598870.

Reason for revert: breaks InlineAugmentedLoginActivityTest
Fix: 175675905

Change-Id: If57386e8cfb18eda1223f9ae3ce28e918327749a
1 file changed