Merge "Extract method and remove duplicate code in ProxyMediaRouter2Impl" into main