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