Merge "Handle onBindingDied in notification manager" am: a13201a99b am: d69921cc9a
am: a92bcc33b2

Change-Id: Id42d66b241ad932c3784b5e7e53a46eb60c7573c