am 18037f14: Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev

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