Merge "Fixing problem trying to use channel-position mask for AudioBox 44VSL." into oreo-cts-dev