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

Change-Id: I9762506997220b4f22589cc3c6542798175d873c