Merge "init: disable oneshot_on test"

init/oneshot_on_test.cpp

@@ -25,6 +25,7 @@ using android::base::SetProperty;
 using android::base::WaitForProperty;
 using namespace std::literals;
 
+#if 0  // TODO(b/152637928): this test is flaky
 TEST(init, oneshot_on) {
     // Bootanim shouldn't be running once the device has booted.
     ASSERT_EQ("stopped", GetProperty("init.svc.bootanim", ""));
@@ -42,3 +43,4 @@ TEST(init, oneshot_on) {
     // Now that oneshot is enabled again, bootanim should transition into the 'stopped' state.
     EXPECT_TRUE(WaitForProperty("init.svc.bootanim", "stopped", 10s));
 }
+#endif