Merge "AudioCapabilities: handle non-standard codec max input channels" into oc-dev am: ffb563d82d
am: 6033c043ff

Change-Id: I7879b4b76a202dce3cebad1ad37aac3ddb599278