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