Merge "Added internal API getMaxConnectedAudioDevices()" am: 877cbe1dc2 am: 18606e1601
am: 9114a49770

Change-Id: I55d0175bb715dbd28176032ace129a2c85a218f0