fixup! TB 34403: [android] Disable Normal mode by default.

Bug 44210: [EXTRA] Drop test changes from original patch. These test
changes justse rebase conflicts. We are not running these tests yet.
Let's drop it for now and deal with it when we decide to run the tests
-- if we do.