[automerger skipped] Merge "[RESTRICT AUTOMERGE]: Revert "[RESTRICT AUTOMERGE]: Add missing @Test annotations for JUnit4 tests."" into pi-dev am: 7ecafcfa2d -s ours

am skip reason: subject contains skip directive

Change-Id: I3b2e4e51dfbebd9db83af8683edddba09e5b70d5