Merge "MediaMetrics: Track audioserver restart times" into tm-dev