Merge "Update use of a.m.a.c.AudioConfig in sthal_cli_3"