Test is flaky. Bug: 31385354 This reverts commit 4beab689. Change-Id: Id22e5b1c5cd3ca7b0e58037ecf3625f7239c5a7c