Merge "AOD: Finish pulse when notification is removed" into oc-dr1-dev
am: 7bed78952e

Change-Id: Id8761920bb2beca8bdf96f69d6915548836594b3