Merge "Remove MediaRoute2Info.getDeviceType" into rvc-dev am: c439bfe7 am: 875c2fed am: 473c59d2 am: 9254cd8f Change-Id: I4f41a09a4633b857fcc2079ea01e4772af9be333