Merge "Add ActivityThreadTest to Window Manager Tests"