Merge "Replace deprecated APIs in audio switcher." into pi-dev am: a46dd4bd4b
am: 746c972c53

Change-Id: Ie537c98ba03e22fd23df3ba58ba3dc729b58027b