Merge "Fixing problem trying to use channel-position mask for AudioBox 44VSL." into oreo-cts-dev am: 13ec459f5d
am: 7e682660da

Change-Id: Ib5399b1462116d453c656bc53de09266d523f947