Merge "Move ActivityManager tests to WmTests"