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

am skip reason: subject contains skip directive

Change-Id: Ic2ecda0b9b231e73828d124ed85743ea1f00f3ea