Merge "Merge "Fix StorageManagerService linkToDeath more than one time when vold/storaged died." am: d7f82d57 am: c80ad354 am: a92cb756" into qt-r1-dev-plus-aosp