Merge "MediaRouter2: Add missing synchronized(sRouterLock) block" into rvc-dev