Merge "Handle onBindingDied in notification manager" into oc-mr1-dev
am: f638a39149

Change-Id: If5aedb5832ece597bd9138bae9c0fd5ba1851f4a