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

Change-Id: I57c326c97f19597bd2865c328e024de4da889e77