Merge "Add rank & count event to notification clicks and dismisses" into pi-dev
am: afc909d3ba

Change-Id: I6ed76bcd0bc5d6dda4ad5b3ec42b56292d93ff18