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

Change-Id: I0e07f8dbf8f6ce5db3c32df3caa05817bff5030c