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