Merge "A2DPSink incoming connections" am: 92b23a4c30 am: 2228a14aa8

Change-Id: I899f503e93396b1e69964f7efaf207b3b2031c78