Merge "Added internal API getMaxConnectedAudioDevices()"
am: 877cbe1dc2

Change-Id: Ifb7b28f3993e3d8967886bdff006bcd2679d3277