Merge "Add a mechanism for handling audio device configuration change"
am: 549e431947

Change-Id: Ia33a6a9a3f4088f0ca351ad2ffe96c5ebd5d7bf7