Merge changes I9d30e61f,I26bfc778 into main

* changes:
  Remove migrated LegacyApfFilter tests from ApfTest.java
  Create LegacyApfTest from ApfTest to split filter testing