Merge "Fix issue where Telecom ANRs due to call into AudioManager." into udc-dev