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