Merge "Fix StorageManagerService linkToDeath more than one time when...
Merge "Fix StorageManagerService linkToDeath more than one time when vold/storaged died." am: d7f82d57 am: c80ad354
am: a92cb756
Change-Id: I275fb4b8d42b5a51b7728bbe7d56a97e8ffd4f49