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

Change-Id: I1495996ec7ddd10973057ec8078f4feb72cab305