Merge "tests for new android.media.metrics.* classes"