Merge "Revisit logging in MediaRouter and MediaSessionRecord"