[automerger skipped] Merge "[RESTRICT AUTOMERGE]: Add missing @Test annotations for JUnit4 tests." into oc-dev am: 7289adc7b5 am: 8ec1ed7a7c -s ours

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

Change-Id: I7ff3b25b06dce76b5ec1cf2701ada6a0b57725a6