Merge "hal: Add change to fix speaker and headphone concurrency."