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