Merge "Add FrameworkStatsdTest to mainline test mapping for Statsd."