Merge "Don't proguard FrameworksServicesTests"