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