[automerger skipped] Merge "Patching around channel-index mask problem in AudioRecord. DO NOT MERGE" into pie-cts-dev
am: 014113d2b7  -s ours

Change-Id: I8588a11b029d54aa6409d9199da5605361fab62c