Merge "Output switcher shows the device list by an incorrect package name" into rvc-dev am: 0581bd7f1c

Change-Id: I58c17401d88eab33745b3bad6c03abf3c90b6e77