Merge "Remove MediaRoute2Info.getDeviceType" into rvc-dev am: c439bfe7 am: 875c2fed am: 9b48b0f5 Change-Id: I02d9691de9cdadd65f6ec4f5be725b0f14a953ac