Merge "Revert "Move AM/WM unit tests out of FrameworksServicesTests to WmTests""