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

Change-Id: I275fb4b8d42b5a51b7728bbe7d56a97e8ffd4f49