Merge "DO NOT MERGE Add developer menu to select max number of connected audio devices" am: ea5243e28d  -s ours
am: b4ed2b2005

Change-Id: I0b80d8c673b680ab530f34420bb330665ab904b8