Merge "Remove MediaRoute2Info.getDeviceType" into rvc-dev