[automerger skipped] [RESTRICT AUTOMERGE]: Add missing @Test annotations for JUnit4 tests. am: 2bc343b61e am: 56308a29b2 -s ours

am skip reason: Change-Id I1ae379ebe2826f2e2dbee24333291fc295430de7 with SHA-1 a8cfc497ec is in history

Change-Id: Ib2224a0edd1bcf0a5666dbc66ca9eacf1f0ed671