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

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