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