Merge "audiopolicy: Add support for hybrid mode on A2DP"