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