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