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

Change-Id: I2648c2262f9baa608a27a6760def8642227ef447