Merge "audiopolicy: restore normal binder call watchdog timeout" into pi-dev