Merge "Remove delay received from audio layer for A2DP state changes"
am: fa31e9b594

Change-Id: I8a639938129e7f994bc6d517f9e238b15f6cf78e