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

Change-Id: I2a6fc7358c3c13cd67fc642d55c9973ab24331d1