Merge "Media: Add ClientRecord in MediaRouter2Service"