am ade537a3: Merge "Fix race in removeDeadProvider. Bug: 5202824"

* commit 'ade537a33109cf86a9fd9bd658d9f7fdf6a08002':
  Fix race in removeDeadProvider. Bug: 5202824