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

Change-Id: I83bb778ff97b0ac3e88e35e2112a357cd136d0eb