This reverts commit b863e6e44b.
Reason for revert: Made G3Compat layout related tests flaky. See b/177911751
Bug: b/177911751
Test: Treehugger
Change-Id: I7e295beedc6581c01328a82b426a6d13feac2249
This reverts commit b863e6e44b.
Reason for revert: Made G3Compat layout related tests flaky. See b/177911751
Bug: b/177911751
Test: Treehugger
Change-Id: I7e295beedc6581c01328a82b426a6d13feac2249