Merge "Add MR2ProviderService APIs to support system media routing" into main