Merge "Log clicks on notification actions" into rvc-dev am: 906f800009 am: 4deb6df00d am: 4a89b5ffad am: 62fc56d117

Change-Id: I020fe6d9d613e58d34d8923dea9a96d33c020bd8