Add support skipping EDP tests for vanilla 2 plugin

partially fixes bug: #1340738

Change-Id: I9a1f3ba2c3a88ce715371c178e3db1def0f3ca13
Merge "Add support skipping EDP tests for vanilla 2 plugin"