Merge "audiopolicy: restore normal binder call watchdog timeout" into pi-dev am: d9ed870e64
am: 8add485d4b

Change-Id: Ie3f5d642ec6003bb9b5fcd9ea8b314fe1891ccde