Merge "Move some AM tests back to FrameworksServicesTests"