am c739a765: Merge "Wrong argument: handleUnstableProviderDiedLocked" into klp-dev

* commit 'c739a765981174dc82bf268c379a5c7bc17167f4':
  Wrong argument: handleUnstableProviderDiedLocked