Merge "MediaRouter2: Fix getRoutes() returning an empty list" into rvc-dev am: 81fd5037 am: 7f1571e9 Change-Id: I0907f75673eb807db08a9e87797bfba46cff1a83