VTS refactoring for filter separation

Test: atest
Bug: 135708935
Change-Id: I22b6249a953b81793fdfbf17adbadeebde12277a
(cherry picked from commit 0f94ba87a0184ff46827705683af851309a6acf8)
Merged-In: I22b6249a953b81793fdfbf17adbadeebde12277a
1 file changed