Merge "Multi-A2DP support - add a new internal API to suppress Audio Noisy intent" am: b51137093c
am: c23ebb0a34

Change-Id: I2cf1e5fdacd38ef3a518e24d3301695d2cee04c1