Merge "MediaRouter2: Fix getRoutes() returning an empty list" into rvc-dev am: 81fd503701

Change-Id: Id64c6e1acc0c853d16d59852be3767cf0d2c930c