Merge "audio: Fix after aosp/2908743 (exit command handling)" into main