[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: ed6dfb63a0 am: 64f5160f40 -s ours

am skip reason: subject contains skip directive

Change-Id: I41ef6e72f7335acc0e5b4694c595aa3cf55b4d74