Merge "'dumpsys media.metrics -proto #' doesn't lose default"