Merge "Merge "Calls unlinkToDeath in binderDied to deregister" am: 72fa61b325 am: d961f427a4" into pi-dev-plus-aosp