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