Merge "Simplify MediaRouter2Manager.Client's lifecycle"