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

Change-Id: I1e0b733fcc666c1f34232fbab5fb97d3c9f6e0ad