Merge "Fix StorageManagerService linkToDeath more than one time when vold/storaged died."