Merge "Fix race in removeDeadProvider. Bug: 5202824"