Merge "Remove delay received from audio layer for A2DP state changes" am: fa31e9b594 am: 2959cd2704
am: 3ec66a3406

Change-Id: I9fed9792bab69879e9969bce7e88897094491dcc