Merge "MediaRouter: Add features to distinguish audio routes" into rvc-dev