Merge "Fix AudioSystem ioConfigChanged log statement" am: f6978a446a am: 59ea9af626

Change-Id: Ib5a37bbdd949b5b926fc7fc09742d5611c7ef23d