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

Change-Id: If17e7d14fbb18ee8849ce7fcb3f270df422a2f72