Merge "Rename WM test filter to FrameworksTestsFilter"
am: d824faeb46

Change-Id: I7a9eebc68ec839dde90f9cf7f9952ac67a3d94df