Merge "Output switcher shows the device list by an incorrect package name" into rvc-dev am: 0581bd7f1c am: d6e814d8e7 am: 3880da0a68 am: 1e288f86b9
Change-Id: I926664f3be2742432530774f5dabd05ac98af958
This commit is contained in: