am 938ff081: (-s ours) am 18037f14: Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev

* commit '938ff081a61d31e5eefca7cee582002aea1c06ff':
  Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""