[automerger skipped] Merge "[RESTRICT AUTOMERGE]: Add missing @Test annotations for JUnit4 tests." into oc-mr1-dev am: c701ebc86e -s ours am: ad8d6c1010 -s ours

am skip reason: subject contains skip directive

Change-Id: I1085511cd8de7f7d0a5d56ec41418a98695989ab