Merge "Handle onBindingDied in notification manager"
am: a13201a99b

Change-Id: I01d3d65fcc6032d5de17f84cdc8eb5119aaeeadf