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