Merge "Remove deprecated Constants from FrameworksServicesTests."