Merge "Fix StorageManagerService linkToDeath more than one time when vold/storaged died." am: d7f82d5766
am: c80ad354b4

Change-Id: I257bc1f51c8a26892b4165c9a30353a992f96a0c