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

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

Change-Id: I9267e289e47489bf1e21d3719ecfdf348d54f8d7