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
am: 4908c0c7c4

Change-Id: Icf79a0ca9f975237736e33cfe22453af41d0c638