Merge "Remove extra tests from NNAPI VTS validation tests" into rvc-dev am: 3c8593c0fe am: 6d82995d48 am: 259dfdf388

Change-Id: Ia74ebb571088ae7dc0b4824cc4763698b3258009