Revert "Invalidate when switching to new consumer"

This reverts commit 4df3b232250781dc8d1d206d74bc0e854da5fafe
and Id0a6a1c5301c66a515cefcab58b77495081c6190, as we have another
change to try and address the original issue.

Bug: 185909226
Change-Id: Ic2c08833e066090a43b989f2f470de298174e84d
1 file changed