Revert "Revert "Revert "Revert "Turn on the feature flag for And..."

Revert submission 13519571-revert-13479025-multiuser_test-BVTHGRYHSS

Reason for revert: b/179457252 has been fixed.
Reverted Changes:
I35e436e99:Revert "Fix the broken test"
I4f77afda4:Revert "Revert "Revert "Turn on the feature flag f...

Change-Id: I92f7ce09a4e4a7ccf302dd67e13bf97e7ecb47e8