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

Change-Id: I04f88e7d16b8da5821050f1ed7a64566b1fadd3d