Merge changes I775aaf78,I60e049a6

* changes:
  Ensure that binders are unlinked from death recipients
  Fix some voice interaction CTS due to regressions