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

Change-Id: I91f5642cb8f2d740e8acbbb739fc42f6a2f1bc63