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

Change-Id: Ie5ff80a2161d3bef3599f0ad39f005d6bf0d40ec